summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Treacy <treacy@debian.org>2009-01-30 01:17:17 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2009-02-09 19:19:47 (GMT)
commit2057ac86da09955c9f8671e36d4f6bd1e7a5d7d2 (patch)
treee53f62f25e2ed7ffd0f07e7a5fed39628c3e03e4
parentaf3ddbd76304f9f602c970f9b09a0c9d8cf8336c (diff)
downloadlinux-fsl-qoriq-2057ac86da09955c9f8671e36d4f6bd1e7a5d7d2.tar.xz
USB: cdc-acm.c: remove duplicate lines for MTK gps support
The same patch to add support for MTK gps loggers was submitted by two different people and applied twice. Remove the redundant lines. Signed-off-by: James Treacy <treacy@debian.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/class/cdc-acm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 97ba4a9..326dd7f 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1349,9 +1349,6 @@ static struct usb_device_id acm_ids[] = {
{ USB_DEVICE(0x0e8d, 0x0003), /* FIREFLY, MediaTek Inc; andrey.arapov@gmail.com */
.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
},
- { USB_DEVICE(0x0e8d, 0x3329), /* i-blue 747, Qstarz BT-Q1000, Holux M-241 */
- .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
- },
{ USB_DEVICE(0x0e8d, 0x3329), /* MediaTek Inc GPS */
.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
},