From patchwork Mon May 3 22:08:34 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: 96574 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o43M8oQr022328 for ; Mon, 3 May 2010 22:08:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758663Ab0ECWIs (ORCPT ); Mon, 3 May 2010 18:08:48 -0400 Received: from mail.gmx.net ([213.165.64.20]:35810 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1758585Ab0ECWIr (ORCPT ); Mon, 3 May 2010 18:08:47 -0400 Received: (qmail invoked by alias); 03 May 2010 22:08:40 -0000 Received: from p4FC43949.dip.t-dialin.net (EHLO mir.localnet) [79.196.57.73] by mail.gmx.net (mp071) with SMTP; 04 May 2010 00:08:40 +0200 X-Authenticated: #1587495 X-Provags-ID: V01U2FsdGVkX1+TpQFOZ26THZMVo4F85FotwoPRCciB7P3IF8Ykzj HhcUak8kHePEBj From: "Stefan Lippers-Hollmann" To: Pavel Roskin Subject: Re: [PATCH 2/4] rt2x00: Enable RT30xx by default. Date: Tue, 4 May 2010 00:08:34 +0200 User-Agent: KMail/1.13.3 (Linux/2.6.34-rc6-sidux-686; KDE/4.4.3; i686; ; ) Cc: Gertjan van Wingerde , "John W. Linville" , Ivo van Doorn , linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com References: <1272919385-18004-1-git-send-email-gwingerde@gmail.com> <1272919385-18004-3-git-send-email-gwingerde@gmail.com> <1272920358.4907.3.camel@mj> In-Reply-To: <1272920358.4907.3.camel@mj> MIME-Version: 1.0 Message-Id: <201005040008.36956.s.L-H@gmx.de> X-Y-GMX-Trusted: 0 X-FuHaFi: 0.44 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 (demeter.kernel.org [140.211.167.41]); Mon, 03 May 2010 22:08:50 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig index 5239e08..ee088ac 100644 --- a/drivers/net/wireless/rt2x00/Kconfig +++ b/drivers/net/wireless/rt2x00/Kconfig @@ -85,17 +85,6 @@ config RT2800PCI if RT2800PCI -config RT2800PCI_RT30XX - bool "rt2800pci - Include support for rt30xx (PCI/PCIe/PCMCIA) devices" - default n - ---help--- - This adds support for rt30xx wireless chipset family to the - rt2800pci driver. - Supported chips: RT3090, RT3091 & RT3092 - - Support for these devices is non-functional at the moment and is - intended for testers and developers. - config RT2800PCI_RT35XX bool "rt2800pci - Include support for rt35xx (PCI/PCIe/PCMCIA) devices" default n diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index 0e52f17..9efd4fb 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c @@ -1225,12 +1225,10 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = { { PCI_DEVICE(0x1432, 0x7758), PCI_DEVICE_DATA(&rt2800pci_ops) }, { PCI_DEVICE(0x1432, 0x7768), PCI_DEVICE_DATA(&rt2800pci_ops) }, { PCI_DEVICE(0x1a3b, 0x1059), PCI_DEVICE_DATA(&rt2800pci_ops) }, -#ifdef CONFIG_RT2800PCI_RT30XX { PCI_DEVICE(0x1814, 0x3090), PCI_DEVICE_DATA(&rt2800pci_ops) }, { PCI_DEVICE(0x1814, 0x3091), PCI_DEVICE_DATA(&rt2800pci_ops) }, { PCI_DEVICE(0x1814, 0x3092), PCI_DEVICE_DATA(&rt2800pci_ops) }, { PCI_DEVICE(0x1462, 0x891a), PCI_DEVICE_DATA(&rt2800pci_ops) }, -#endif #ifdef CONFIG_RT2800PCI_RT35XX { PCI_DEVICE(0x1814, 0x3060), PCI_DEVICE_DATA(&rt2800pci_ops) }, { PCI_DEVICE(0x1814, 0x3062), PCI_DEVICE_DATA(&rt2800pci_ops) },