net: cdc_ncm: remove non-standard NCM device IDs
authorEnrico Mioso <mrkiko.rs@gmail.com>
Mon, 4 Nov 2013 08:50:49 +0000 (09:50 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Nov 2013 20:21:26 +0000 (15:21 -0500)
Remove device IDs of NCM-like (but not NCM-conformant) devices, that are
handled by the huawwei_cdc_ncm driver now.

Signed-off-by: Enrico Mioso <mrkiko.rs@gmail.com>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/cdc_ncm.c

index 1763195bd599fc36c9d5a467efeb136bb8dcf878..f74786aa37be3cca7a4020cc82b08f0777aec4f5 100644 (file)
@@ -1186,17 +1186,6 @@ static const struct usb_device_id cdc_devs[] = {
          .driver_info = (unsigned long)&wwan_info,
        },
 
-       /* Huawei NCM devices disguised as vendor specific */
-       { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x16),
-         .driver_info = (unsigned long)&wwan_info,
-       },
-       { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x46),
-         .driver_info = (unsigned long)&wwan_info,
-       },
-       { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x76),
-         .driver_info = (unsigned long)&wwan_info,
-       },
-
        /* Infineon(now Intel) HSPA Modem platform */
        { USB_DEVICE_AND_INTERFACE_INFO(0x1519, 0x0443,
                USB_CLASS_COMM,