On 01/14/2011 05:08 PM, Stefan Lippers-Hollmann wrote: > * select FW_LOADER > * change firmware location to represent published linux-fimware.git > * declare MODULE_FIRMWARE for r8712u > > Signed-off-by: Stefan Lippers-Hollmann <[email protected]> > --- > drivers/staging/rtl8712/Kconfig | 1 + > drivers/staging/rtl8712/hal_init.c | 3 ++- > 2 files changed, 3 insertions(+), 1 deletions(-) > > 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 52ab2d5..1411c7bf 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) > {
Thanks for the review. These changes are all in PATCH 4/4. Apparently, my ISP is having some difficulties with that one, or perhaps LKML will not post it. In it, I delete the 10K+ lines of internal firmware in a header file, and all of them are in the patch. Larry _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
