diff options
author | Enrico Mioso <mrkiko.rs@gmail.com> | 2013-11-04 03:50:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-05 15:21:26 -0500 |
commit | 9fea037de5f33973d48e8f893a0087c6f9861e7b (patch) | |
tree | 74a2dae9cff86791b84552cff62c575fe44da743 | |
parent | 41c47d8cfd685cae6b08f9300fef12e602609b26 (diff) |
net: cdc_ncm: remove non-standard NCM device IDs
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>
-rw-r--r-- | drivers/net/usb/cdc_ncm.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 1763195bd599..f74786aa37be 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c | |||
@@ -1186,17 +1186,6 @@ static const struct usb_device_id cdc_devs[] = { | |||
1186 | .driver_info = (unsigned long)&wwan_info, | 1186 | .driver_info = (unsigned long)&wwan_info, |
1187 | }, | 1187 | }, |
1188 | 1188 | ||
1189 | /* Huawei NCM devices disguised as vendor specific */ | ||
1190 | { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x16), | ||
1191 | .driver_info = (unsigned long)&wwan_info, | ||
1192 | }, | ||
1193 | { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x46), | ||
1194 | .driver_info = (unsigned long)&wwan_info, | ||
1195 | }, | ||
1196 | { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x76), | ||
1197 | .driver_info = (unsigned long)&wwan_info, | ||
1198 | }, | ||
1199 | |||
1200 | /* Infineon(now Intel) HSPA Modem platform */ | 1189 | /* Infineon(now Intel) HSPA Modem platform */ |
1201 | { USB_DEVICE_AND_INTERFACE_INFO(0x1519, 0x0443, | 1190 | { USB_DEVICE_AND_INTERFACE_INFO(0x1519, 0x0443, |
1202 | USB_CLASS_COMM, | 1191 | USB_CLASS_COMM, |