Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / include / linux / firmware.h

diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 2063c08..33d8f20 100644 (file)
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -14,10 +14,9 @@ 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));
 
 void release_firmware(const struct firmware *fw);
-void register_firmware(const char *name, const u8 *data, size_t size);
 #endif