diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-10 18:04:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-10 18:04:00 -0700 |
| commit | ee215ca3b21dd73bec95dcaaa8c89e64cff6cbf8 (patch) | |
| tree | 8e557460f0cf557d26d5f59991ebffc3402b10e9 /include/linux | |
| parent | aeb24d2fb08653a39abb50281b1ffa2d2a6879ab (diff) | |
| parent | e88a0c2ca81207a75afe5bbb8020541dabf606ac (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
drivers: fix dma_get_required_mask
firmware: provide stubs for the FW_LOADER=n case
nozomi: fix initialization and early flow control access
sysdev: fix problem with sysdev_class being re-registered
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/firmware.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 33d8f2087b6..4d10c7328d2 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h @@ -10,7 +10,10 @@ struct firmware { size_t size; u8 *data; }; + struct device; + +#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) int request_firmware(const struct firmware **fw, const char *name, struct device *device); int request_firmware_nowait( @@ -19,4 +22,24 @@ int request_firmware_nowait( void (*cont)(const struct firmware *fw, void *context)); void release_firmware(const struct firmware *fw); +#else +static inline int request_firmware(const struct firmware **fw, + const char *name, + struct device *device) +{ + return -EINVAL; +} +static inline int request_firmware_nowait( + struct module *module, int uevent, + const char *name, struct device *device, void *context, + void (*cont)(const struct firmware *fw, void *context)) +{ + return -EINVAL; +} + +static inline void release_firmware(const struct firmware *fw) +{ +} +#endif + #endif |