Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / include / linux / firmware.h

diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 2063c0839d4fc3e0da2022d4303b4cce327e7d0e..2d716080be4af7bd98fad2a5a45cd4b884812cd0 100644 (file)
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -14,7 +14,7 @@ struct device;
 int request_firmware(const struct firmware **fw, const char *name,
                     struct device *device);
 int request_firmware_nowait(
-       struct module *module, int hotplug,
+       struct module *module, int uevent,
        const char *name, struct device *device, void *context,
        void (*cont)(const struct firmware *fw, void *context));