51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From: Larry Finger <Larry.Finger@lwfinger.net>
|
|
Date: Fri, 14 Jan 2011 15:02:18 -0600
|
|
Subject: [PATCH] staging: r8712u: Firmware changes for driver
|
|
|
|
commit b54a28a418b2730bf61554864fee3fb24f79e182 upstream.
|
|
|
|
* select FW_LOADER in Kconfig - From: Stefan Lippers-Hollmann <s.l-h@gmx.de>
|
|
* declare MODULE_FIRMWARE for r8712u and change to correct directory
|
|
* delete 10K line farray.h containing internal firmware
|
|
|
|
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
[bwh: Strip removal of farray.h]
|
|
---
|
|
diff --git a/drivers/staging/rtl8712/Kconfig b/drivers/staging/rtl8712/Kconfig
|
|
index 1e9a230..041e1e8 100644
|
|
--- a/drivers/staging/rtl8712/Kconfig
|
|
+++ b/drivers/staging/rtl8712/Kconfig
|
|
@@ -3,6 +3,7 @@ config R8712U
|
|
depends on WLAN && USB
|
|
select WIRELESS_EXT
|
|
select WEXT_PRIV
|
|
+ select FW_LOADER
|
|
default N
|
|
---help---
|
|
This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130.
|
|
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
|
|
index 014fbbc..8323c6a 100644
|
|
--- a/drivers/staging/rtl8712/hal_init.c
|
|
+++ b/drivers/staging/rtl8712/hal_init.c
|
|
@@ -40,7 +40,7 @@ static u32 rtl871x_open_fw(struct _adapter *padapter, void **pphfwfile_hdl,
|
|
const u8 **ppmappedfw)
|
|
{
|
|
int rc;
|
|
- const char firmware_file[] = "rtl8712u/rtl8712u.bin";
|
|
+ const char firmware_file[] = "rtlwifi/rtl8712u.bin";
|
|
const struct firmware **praw = (const struct firmware **)
|
|
(pphfwfile_hdl);
|
|
struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)
|
|
@@ -58,6 +58,7 @@ static u32 rtl871x_open_fw(struct _adapter *padapter, void **pphfwfile_hdl,
|
|
*ppmappedfw = (u8 *)((*praw)->data);
|
|
return (*praw)->size;
|
|
}
|
|
+MODULE_FIRMWARE("rtlwifi/rtl8712u.bin");
|
|
|
|
static void fill_fwpriv(struct _adapter *padapter, struct fw_priv *pfwpriv)
|
|
{
|
|
--
|
|
1.7.2.3
|
|
|