From patchwork Fri Oct 29 20:03:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Lippers-Hollmann X-Patchwork-Id: 291182 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9TK3mmo012915 for ; Fri, 29 Oct 2010 20:03:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932458Ab0J2UDr (ORCPT ); Fri, 29 Oct 2010 16:03:47 -0400 Received: from mailout-de.gmx.net ([213.165.64.23]:42737 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1754404Ab0J2UDq (ORCPT ); Fri, 29 Oct 2010 16:03:46 -0400 Received: (qmail invoked by alias); 29 Oct 2010 20:03:45 -0000 Received: from p4FC47BEA.dip.t-dialin.net (EHLO mir.localnet) [79.196.123.234] by mail.gmx.net (mp071) with SMTP; 29 Oct 2010 22:03:45 +0200 X-Authenticated: #1587495 X-Provags-ID: V01U2FsdGVkX18bC3ZmtB0be5RZgHxAIsdm15tUdW/0GOIeEDYuTZ ELWNN2iRslaa2p From: "Stefan Lippers-Hollmann" To: Larry Finger Subject: staging: r8712u: Fix external firmware loading Date: Fri, 29 Oct 2010 22:03:36 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.36-0.slh.1-aptosid-686; KDE/4.4.5; i686; ; ) Cc: wireless References: <4CC9F4BE.7070500@lwfinger.net> <201010292202.25486.s.L-H@gmx.de> In-Reply-To: <201010292202.25486.s.L-H@gmx.de> MIME-Version: 1.0 Message-Id: <201010292203.39953.s.L-H@gmx.de> X-Y-GMX-Trusted: 0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 29 Oct 2010 20:03:48 +0000 (UTC) --- 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. --- a/drivers/staging/rtl8712/hal_init.c +++ b/drivers/staging/rtl8712/hal_init.c @@ -58,6 +58,7 @@ static u32 rtl871x_open_fw(struct _adapt *ppmappedfw = (u8 *)((*praw)->data); return (*praw)->size; } +MODULE_FIRMWARE("rtl8712u/rtl8712u.bin"); static void fill_fwpriv(struct _adapter *padapter, struct fw_priv *pfwpriv) {