From patchwork Sun Mar 27 00:15:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 666271 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 p2R0GHRL025662 for ; Sun, 27 Mar 2011 00:16:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752538Ab1C0AQH (ORCPT ); Sat, 26 Mar 2011 20:16:07 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:58554 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752368Ab1C0AQG (ORCPT ); Sat, 26 Mar 2011 20:16:06 -0400 Received: by wwa36 with SMTP id 36so2577471wwa.1 for ; Sat, 26 Mar 2011 17:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer; bh=DVZX1XVq87q942trYE1h4saY7CnPsDROMprJ8CpfKVo=; b=u4TI3TD3O/TOw2TcBOuFpd7KQUUnKZR4wYP943PiOa4X2vmqexpOWSWmuye5OHpC0Z /h/zolgkadSkqTJBzQhUlXJT3UJmPk3F2gman6uclYlvVfyOGQcnCskX1DMwIS4+CQrT 1uH5UF7/LcaWsRzY9L0tWpfYzqZWAQiO3teI8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer; b=s8ePprMQaPuW3+5WSi6IpUPvXOf6HElY9ThWIp07lHap2ryNS6XBL20KnR0SE3qTcb fKf2qJkAPg+rMS8G3h7xM5mGh6LI9BaA9R46ycPIhr4gETRcLSFGsI3ILtx8O0mz4A6X fKMRyZu2CWqlw9wimcZTsyzHHzQhFgaWbfdcM= Received: by 10.216.143.7 with SMTP id k7mr2168102wej.95.1301184963774; Sat, 26 Mar 2011 17:16:03 -0700 (PDT) Received: from localhost (197.160.220.87.dynamic.jazztel.es [87.220.160.197]) by mx.google.com with ESMTPS id l5sm913774wej.8.2011.03.26.17.16.00 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 26 Mar 2011 17:16:02 -0700 (PDT) From: Xose Vazquez Perez To: xose.vazquez@gmail.com, linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com, IvDoorn@gmail.com, linville@tuxdriver.com, gwingerde@gmail.com Subject: [PATCH] wireless: rt2x00: rt{2500,73}usb.c fix duplicate ids Date: Sun, 27 Mar 2011 01:15:53 +0100 Message-Id: <1301184953-18436-1-git-send-email-xose.vazquez@gmail.com> X-Mailer: git-send-email 1.7.4 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.6 (demeter1.kernel.org [140.211.167.41]); Sun, 27 Mar 2011 00:16:18 +0000 (UTC) ============= ==== ====== ==== ====== 0x050d,0x7050 - - - YES 0x050d,0x705a - - YES - 0x1371,0x9022 - YES YES - 0x148f,0x2573 YES - YES - Signed-off-by: Xose Vazquez Perez --- drivers/net/wireless/rt2x00/rt2500usb.c | 4 ---- drivers/net/wireless/rt2x00/rt73usb.c | 1 - 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 979fe65..f6682f0 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c @@ -1910,13 +1910,10 @@ static struct usb_device_id rt2500usb_device_table[] = { /* Belkin */ { USB_DEVICE(0x050d, 0x7050), USB_DEVICE_DATA(&rt2500usb_ops) }, { USB_DEVICE(0x050d, 0x7051), USB_DEVICE_DATA(&rt2500usb_ops) }, - { USB_DEVICE(0x050d, 0x705a), USB_DEVICE_DATA(&rt2500usb_ops) }, /* Cisco Systems */ { USB_DEVICE(0x13b1, 0x000d), USB_DEVICE_DATA(&rt2500usb_ops) }, { USB_DEVICE(0x13b1, 0x0011), USB_DEVICE_DATA(&rt2500usb_ops) }, { USB_DEVICE(0x13b1, 0x001a), USB_DEVICE_DATA(&rt2500usb_ops) }, - /* CNet */ - { USB_DEVICE(0x1371, 0x9022), USB_DEVICE_DATA(&rt2500usb_ops) }, /* Conceptronic */ { USB_DEVICE(0x14b2, 0x3c02), USB_DEVICE_DATA(&rt2500usb_ops) }, /* D-LINK */ @@ -1939,7 +1936,6 @@ static struct usb_device_id rt2500usb_device_table[] = { /* Ralink */ { USB_DEVICE(0x148f, 0x1706), USB_DEVICE_DATA(&rt2500usb_ops) }, { USB_DEVICE(0x148f, 0x2570), USB_DEVICE_DATA(&rt2500usb_ops) }, - { USB_DEVICE(0x148f, 0x2573), USB_DEVICE_DATA(&rt2500usb_ops) }, { USB_DEVICE(0x148f, 0x9020), USB_DEVICE_DATA(&rt2500usb_ops) }, /* Sagem */ { USB_DEVICE(0x079b, 0x004b), USB_DEVICE_DATA(&rt2500usb_ops) }, diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 02f1148..bc7a957 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c @@ -2407,7 +2407,6 @@ static struct usb_device_id rt73usb_device_table[] = { { USB_DEVICE(0x0b05, 0x1723), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x0b05, 0x1724), USB_DEVICE_DATA(&rt73usb_ops) }, /* Belkin */ - { USB_DEVICE(0x050d, 0x7050), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x050d, 0x705a), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x050d, 0x905b), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x050d, 0x905c), USB_DEVICE_DATA(&rt73usb_ops) },