]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
p54usb: Comment out duplicate Medion MD40900 device id
authorLeann Ogasawara <leann.ogasawara@canonical.com>
Tue, 15 Jun 2010 21:01:51 +0000 (14:01 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 16 Jun 2010 18:58:57 +0000 (14:58 -0400)
The Medion MD40900 device id [0x0cde, 0x0006] is defined twice.
Comment out the duplicate.

Originally-by: Ben Collins <ben.collins@ubuntu.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/p54/p54usb.c

index b0318ea59b7fa70e189dc5d608e3d6a20c29b732..ad595958b7df19f144a38671cc0424551aaba709 100644 (file)
@@ -69,7 +69,8 @@ static struct usb_device_id p54u_table[] __devinitdata = {
        {USB_DEVICE(0x0915, 0x2002)},   /* Cohiba Proto board */
        {USB_DEVICE(0x0baf, 0x0118)},   /* U.S. Robotics U5 802.11g Adapter*/
        {USB_DEVICE(0x0bf8, 0x1009)},   /* FUJITSU E-5400 USB D1700*/
-       {USB_DEVICE(0x0cde, 0x0006)},   /* Medion MD40900 */
+       /* {USB_DEVICE(0x0cde, 0x0006)}, * Medion MD40900 already listed above,
+                                        * just noting it here for clarity */
        {USB_DEVICE(0x0cde, 0x0008)},   /* Sagem XG703A */
        {USB_DEVICE(0x0cde, 0x0015)},   /* Zcomax XG-705A */
        {USB_DEVICE(0x0d8e, 0x3762)},   /* DLink DWL-G120 Cohiba */