summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJames Treacy2009-01-30 02:17:17 +0100
committerGreg Kroah-Hartman2009-02-09 20:19:47 +0100
commit2057ac86da09955c9f8671e36d4f6bd1e7a5d7d2 (patch)
treee53f62f25e2ed7ffd0f07e7a5fed39628c3e03e4 /drivers/usb
parentUSB: fsl_qe_udc: Fix stalled TX requests bug (diff)
downloadkernel-qcow2-linux-2057ac86da09955c9f8671e36d4f6bd1e7a5d7d2.tar.gz
kernel-qcow2-linux-2057ac86da09955c9f8671e36d4f6bd1e7a5d7d2.tar.xz
kernel-qcow2-linux-2057ac86da09955c9f8671e36d4f6bd1e7a5d7d2.zip
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>
Diffstat (limited to 'drivers/usb')
-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 97ba4a985edc..326dd7f65ee9 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 */
},