diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 19:33:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 19:33:13 +1100 |
| commit | 554546f696e80fb5b38dc280ebba92710ddbdcf0 (patch) | |
| tree | f0a49e505c8ef3c0959517a0e04e7219d27acf39 /include | |
| parent | d707953c5a68f4e4deea9cf72ac815f6836270cd (diff) | |
| parent | 72ed576ff9443ab516a574bab099554d0c4a0034 (diff) | |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 2 | ||||
| -rw-r--r-- | include/linux/firmware.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 71fbd582a265..9221f78bbfd9 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -569,7 +569,7 @@ extern void wait_for_device_probe(void); #ifdef CONFIG_DEVTMPFS extern int devtmpfs_create_node(struct device *dev); extern int devtmpfs_delete_node(struct device *dev); -extern int devtmpfs_mount(const char *mountpoint); +extern int devtmpfs_mount(const char *mntdir); #else static inline int devtmpfs_create_node(struct device *dev) { return 0; } static inline int devtmpfs_delete_node(struct device *dev) { return 0; } diff --git a/include/linux/firmware.h b/include/linux/firmware.h index d31544628436..043811f0d277 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h @@ -4,6 +4,7 @@ #include <linux/module.h> #include <linux/types.h> #include <linux/compiler.h> +#include <linux/gfp.h> #define FW_ACTION_NOHOTPLUG 0 #define FW_ACTION_HOTPLUG 1 @@ -38,7 +39,7 @@ int request_firmware(const struct firmware **fw, const char *name, struct device *device); int request_firmware_nowait( struct module *module, int uevent, - const char *name, struct device *device, void *context, + const char *name, struct device *device, gfp_t gfp, void *context, void (*cont)(const struct firmware *fw, void *context)); void release_firmware(const struct firmware *fw); @@ -51,7 +52,7 @@ static inline int request_firmware(const struct firmware **fw, } static inline int request_firmware_nowait( struct module *module, int uevent, - const char *name, struct device *device, void *context, + const char *name, struct device *device, gfp_t gfp, void *context, void (*cont)(const struct firmware *fw, void *context)) { return -EINVAL; |