diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-10 15:25:42 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-10 15:25:42 +0300 |
| commit | f9915bfef3c64ea0b0b960dd1b999b584a7ef460 (patch) | |
| tree | ec8d1c35a542e4c8e08b5a2be380b2bdef9a10d0 /drivers/usb/class/cdc-acm.c | |
| parent | b91facc367366b3f71375f337eb5997ec9ab4e69 (diff) | |
| parent | acd895795d35d7c6405f20301a846d16998795ec (diff) | |
| download | linux-f9915bfef3c64ea0b0b960dd1b999b584a7ef460.tar.xz | |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
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 */ }, |