From patchwork Tue Apr 6 17:26:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 90811 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 o36HQxTW028340 for ; Tue, 6 Apr 2010 17:26:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756428Ab0DFR05 (ORCPT ); Tue, 6 Apr 2010 13:26:57 -0400 Received: from fg-out-1718.google.com ([72.14.220.159]:34340 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755845Ab0DFR05 (ORCPT ); Tue, 6 Apr 2010 13:26:57 -0400 Received: by fg-out-1718.google.com with SMTP id 19so1138594fgg.1 for ; Tue, 06 Apr 2010 10:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=5KGBNFbd7gqQ2us8id/AdhgxhvHOuOmoBtKvwez2DQE=; b=wNus1mXyG2zLdLOzKNk14haUSK2yKuDSQKL0CHOMEx49nak/F5FhMu8mwS6OqMznx4 vNv58C3CpHK1/jglNsZ5S423WRq3hIVncz0hCet4Sf2Ww8tgycy1v/5YfGlrpRaCjtF2 6RkZB4ryD/F6Saj+ROslyl6V4PnH9LzTaJ418= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=uFkbh7E/TotdSEG5D4twqVxFeP9/6VeH4BfMF8hAK8lW20M68CzmOoUA1eIu+VfLKL u9909rbZRDoxmwdRGltj7ZX5geppO3EulqE3zv4eMxd+smWXfo43kwSbsb97PhxBj0+U hlBAyGnVSGa8WtBVxGRSBQ3jziQvKVBPoc+ws= Received: by 10.102.174.39 with SMTP id w39mr4062923mue.20.1270574815371; Tue, 06 Apr 2010 10:26:55 -0700 (PDT) Received: from localhost (62-87-54-9.red-acceso.airtel.net [62.87.54.9]) by mx.google.com with ESMTPS id e10sm778086muf.38.2010.04.06.10.26.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 06 Apr 2010 10:26:46 -0700 (PDT) From: Xose Vazquez Perez To: linux-wireless@vger.kernel.org Cc: users@rt2x00.serialmonkey.com, linville@tuxdriver.com, IvDoorn@gmail.com, gwingerde@gmail.com, Xose Vazquez Perez Subject: [PATCH] wireless: rt2x00: delete duplicates ids in rt73usb rt2500usb Date: Tue, 6 Apr 2010 19:26:31 +0200 Message-Id: <1270574791-14006-1-git-send-email-xose.vazquez@gmail.com> X-Mailer: git-send-email 1.6.6.1 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]); Tue, 06 Apr 2010 17:27:00 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 13444b6..c7f6fa6 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c @@ -1849,13 +1849,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 */ @@ -1878,7 +1875,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 290d70b..3e30ccf 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c @@ -2339,7 +2339,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) },