diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:05:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:05:40 -0400 |
| commit | a5e6b135bdff649e4330f98e2e80dbb1984f7e77 (patch) | |
| tree | 475bfb1163c59d1370fd77415255afba768f9520 /include/linux/firmware.h | |
| parent | 971f115a50afbe409825c9f3399d5a3b9aca4381 (diff) | |
| parent | 9d90c8d9cde929cbc575098e825d7c29d9f45054 (diff) | |
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (50 commits)
printk: do not mangle valid userspace syslog prefixes
efivars: Add Documentation
efivars: Expose efivars functionality to external drivers.
efivars: Parameterize operations.
efivars: Split out variable registration
efivars: parameterize efivars
efivars: Make efivars bin_attributes dynamic
efivars: move efivars globals into struct efivars
drivers:misc: ti-st: fix debugging code
kref: Fix typo in kref documentation
UIO: add PRUSS UIO driver support
Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches
firmware: Fix unaligned memory accesses in dmi-sysfs
firmware: Add documentation for /sys/firmware/dmi
firmware: Expose DMI type 15 System Event Log
firmware: Break out system_event_log in dmi-sysfs
firmware: Basic dmi-sysfs support
firmware: Add DMI entry types to the headers
Driver core: convert platform_{get,set}_drvdata to static inline functions
Translate linux-2.6/Documentation/magic-number.txt into Chinese
...
Diffstat (limited to 'include/linux/firmware.h')
| -rw-r--r-- | include/linux/firmware.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 53d1e6c4f848..21b3e7588abd 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h | |||
| @@ -39,7 +39,7 @@ struct builtin_fw { | |||
| 39 | int request_firmware(const struct firmware **fw, const char *name, | 39 | int request_firmware(const struct firmware **fw, const char *name, |
| 40 | struct device *device); | 40 | struct device *device); |
| 41 | int request_firmware_nowait( | 41 | int request_firmware_nowait( |
| 42 | struct module *module, int uevent, | 42 | struct module *module, bool uevent, |
| 43 | const char *name, struct device *device, gfp_t gfp, void *context, | 43 | const char *name, struct device *device, gfp_t gfp, void *context, |
| 44 | void (*cont)(const struct firmware *fw, void *context)); | 44 | void (*cont)(const struct firmware *fw, void *context)); |
| 45 | 45 | ||
| @@ -52,7 +52,7 @@ static inline int request_firmware(const struct firmware **fw, | |||
| 52 | return -EINVAL; | 52 | return -EINVAL; |
| 53 | } | 53 | } |
| 54 | static inline int request_firmware_nowait( | 54 | static inline int request_firmware_nowait( |
| 55 | struct module *module, int uevent, | 55 | struct module *module, bool uevent, |
| 56 | const char *name, struct device *device, gfp_t gfp, void *context, | 56 | const char *name, struct device *device, gfp_t gfp, void *context, |
| 57 | void (*cont)(const struct firmware *fw, void *context)) | 57 | void (*cont)(const struct firmware *fw, void *context)) |
| 58 | { | 58 | { |