aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/firmware.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-09-08 01:45:47 -0400
committerLen Brown <len.brown@intel.com>2005-09-08 01:45:47 -0400
commit64e47488c913ac704d465a6af86a26786d1412a5 (patch)
treed3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /include/linux/firmware.h
parent4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff)
parentcaf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff)
downloadkernel_samsung_smdk4412-64e47488c913ac704d465a6af86a26786d1412a5.zip
kernel_samsung_smdk4412-64e47488c913ac704d465a6af86a26786d1412a5.tar.gz
kernel_samsung_smdk4412-64e47488c913ac704d465a6af86a26786d1412a5.tar.bz2
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/linux/firmware.h')
-rw-r--r--include/linux/firmware.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 886255b..2063c08 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -3,6 +3,9 @@
#include <linux/module.h>
#include <linux/types.h>
#define FIRMWARE_NAME_MAX 30
+#define FW_ACTION_NOHOTPLUG 0
+#define FW_ACTION_HOTPLUG 1
+
struct firmware {
size_t size;
u8 *data;
@@ -11,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,
+ struct module *module, int hotplug,
const char *name, struct device *device, void *context,
void (*cont)(const struct firmware *fw, void *context));