From patchwork Thu Sep 3 11:42:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 45342 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n83BhD4q008918 for ; Thu, 3 Sep 2009 11:43:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755011AbZICLmX (ORCPT ); Thu, 3 Sep 2009 07:42:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754421AbZICLmW (ORCPT ); Thu, 3 Sep 2009 07:42:22 -0400 Received: from mail-fx0-f217.google.com ([209.85.220.217]:52279 "EHLO mail-fx0-f217.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751863AbZICLmW (ORCPT ); Thu, 3 Sep 2009 07:42:22 -0400 Received: by fxm17 with SMTP id 17so1469966fxm.37 for ; Thu, 03 Sep 2009 04:42:23 -0700 (PDT) Received: by 10.87.31.38 with SMTP id i38mr3756180fgj.36.1251978142752; Thu, 03 Sep 2009 04:42:22 -0700 (PDT) Received: from localhost (a91-154-121-48.elisa-laajakaista.fi [91.154.121.48]) by mx.google.com with ESMTPS id d4sm2639260fga.25.2009.09.03.04.42.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Sep 2009 04:42:22 -0700 (PDT) From: Amit Kucheria To: List Linux Kernel Cc: linux-wireless@vger.kernel.org, Amit Kucheria , Ivo van Doorn Subject: [PATCH] rt2x00: Get rid of duplicate usb id from rt2500usb Date: Thu, 3 Sep 2009 14:42:20 +0300 Message-Id: <1251978140-4992-1-git-send-email-amit.kucheria@canonical.com> X-Mailer: git-send-email 1.6.3.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org USB_DEVICE(0x148f, 0x2573) is served by the rt73usb driver where it is already defined. Remove it from rt2500usb. Signed-off-by: Amit Kucheria Cc: Ivo van Doorn --- drivers/net/wireless/rt2x00/rt2500usb.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index ce75426..2e9fac7 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c @@ -2020,7 +2020,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) },