diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-01-14 21:02:18 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-21 20:23:55 (GMT) |
| commit | b54a28a418b2730bf61554864fee3fb24f79e182 (patch) | |
| tree | c6a36eb665a0ee43a890dee000f5afc9896510fa /drivers/staging/rtl8712/hal_init.c | |
| parent | c84a7028cc4957e39af5ed8b1a3c8acda24a2a89 (diff) | |
| download | linux-b54a28a418b2730bf61554864fee3fb24f79e182.tar.xz | |
staging: r8712u: Firmware changes for driver
* 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>
Diffstat (limited to 'drivers/staging/rtl8712/hal_init.c')
| -rw-r--r-- | drivers/staging/rtl8712/hal_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |