firmware: make fw->data const

[deliverable/linux.git] / include / linux / firmware.h

diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 4d10c7328d2dabafcee9cf285bf263ba6988b3cd..88718d60153c0332e1154ccc240cd5c15b46d618 100644 (file)
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -8,12 +8,12 @@
 
 struct firmware {
        size_t size;
-       u8 *data;
+       const u8 *data;
 };
 
 struct device;
 
-#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
+#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE))
 int request_firmware(const struct firmware **fw, const char *name,
                     struct device *device);
 int request_firmware_nowait(