From f486b8e8e2346494ae2c1af1f8900dbe250ce00c Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Wed, 25 Jul 2012 13:08:47 -0600
Subject: [PATCH] --- yaml --- r: 324505 b: refs/heads/master c:
 7f34f412896aa493fd99a8dc745cfd2ec3a55103 h: refs/heads/master i:   324503:
 98e9150030f1aea3646cc724725439f40629ba29 v: v3

---
 [refs]                                                   | 2 +-
 .../drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c  | 9 +++++----
 .../drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h  | 4 ++++
 trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c       | 3 +++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index aba1627c4f28..437562ea6124 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1deef918ec5f5f17bdf41876a30a67a29a87807b
+refs/heads/master: 7f34f412896aa493fd99a8dc745cfd2ec3a55103
diff --git a/trunk/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/trunk/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index b526fa428679..dd2a96bfcc0c 100644
--- a/trunk/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/trunk/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -265,10 +265,11 @@ bool init_firmware(struct net_device *dev)
 			case FW_SOURCE_IMG_FILE:
 			{
 				if (pfirmware->firmware_buf_size[init_step] == 0) {
-					const char *fw_name[3] = { "RTL8192E/boot.img",
-							   "RTL8192E/main.img",
-							   "RTL8192E/data.img"
-							 };
+					const char *fw_name[3] = {
+							RTL8192E_BOOT_IMG_FW,
+							RTL8192E_MAIN_IMG_FW,
+							RTL8192E_DATA_IMG_FW
+					};
 					const struct firmware	*fw_entry;
 					int rc;
 					rc = request_firmware(&fw_entry,
diff --git a/trunk/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h b/trunk/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
index caa878833106..06d6abc8345c 100644
--- a/trunk/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
+++ b/trunk/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
@@ -23,6 +23,10 @@
 
 #define GET_COMMAND_PACKET_FRAG_THRESHOLD(v)	(4*(v/4) - 8)
 
+#define RTL8192E_BOOT_IMG_FW	"RTL8192E/boot.img"
+#define RTL8192E_MAIN_IMG_FW	"RTL8192E/main.img"
+#define RTL8192E_DATA_IMG_FW	"RTL8192E/data.img"
+
 enum firmware_init_step {
 	FW_INIT_STEP0_BOOT = 0,
 	FW_INIT_STEP1_MAIN = 1,
diff --git a/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 4f602b227b50..42e5c5c495e0 100644
--- a/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -3125,6 +3125,9 @@ MODULE_DESCRIPTION("Linux driver for Realtek RTL819x WiFi cards");
 MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
 MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE(RTL8192E_BOOT_IMG_FW);
+MODULE_FIRMWARE(RTL8192E_MAIN_IMG_FW);
+MODULE_FIRMWARE(RTL8192E_DATA_IMG_FW);
 
 module_param(ifname, charp, S_IRUGO|S_IWUSR);
 module_param(hwwep, int, S_IRUGO|S_IWUSR);