X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Ffirmware.h;h=4d10c7328d2dabafcee9cf285bf263ba6988b3cd;hb=c8234ea37fb8b7a904223672edf36d269ea569a2;hp=2063c0839d4fc3e0da2022d4303b4cce327e7d0e;hpb=32983696a48a6c41d99f3eca82ba7510a552d843;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 2063c0839d4..4d10c7328d2 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -10,14 +10,36 @@ struct firmware {
 	size_t size;
 	u8 *data;
 };
+
 struct device;
+
+#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
 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);
+#else
+static inline int request_firmware(const struct firmware **fw,
+				   const char *name,
+				   struct device *device)
+{
+	return -EINVAL;
+}
+static inline int request_firmware_nowait(
+	struct module *module, int uevent,
+	const char *name, struct device *device, void *context,
+	void (*cont)(const struct firmware *fw, void *context))
+{
+	return -EINVAL;
+}
+
+static inline void release_firmware(const struct firmware *fw)
+{
+}
+#endif
+
 #endif