From a4fc6fd69cd0e61464dbd87660d33b61f82200cd Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Fri, 7 Mar 2008 08:57:54 -0600
Subject: [PATCH] --- yaml --- r: 87131 b: refs/heads/master c:
 fbab976d7ce4556d4212d554f766dae461d22e16 h: refs/heads/master i:   87129:
 d2490f29b147381d7f7b4a5f7826352eed2184d7   87127:
 3e3af0800e8fa0e6ba9f2274b78fb419ca89785e v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/firmware.h | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 06a4480b1871..6c9649d1e408 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 661b4e89daf10e3f65a1086fd95c7a84720ccdd2
+refs/heads/master: fbab976d7ce4556d4212d554f766dae461d22e16
diff --git a/trunk/include/linux/firmware.h b/trunk/include/linux/firmware.h
index 33d8f2087b6e..4d10c7328d2d 100644
--- a/trunk/include/linux/firmware.h
+++ b/trunk/include/linux/firmware.h
@@ -10,7 +10,10 @@ 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(
@@ -19,4 +22,24 @@ int request_firmware_nowait(
 	void (*cont)(const struct firmware *fw, void *context));
 
 void release_firmware(const struct firmware *fw);
+#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