diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
| commit | a2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch) | |
| tree | 2def96ef17c0672c30f1a10287552978bf1d0b1c /drivers/usb/class/cdc-acm.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index adff5a77e31f..16ecad30e29c 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -980,6 +980,9 @@ static struct usb_device_id acm_ids[] = { | |||
| 980 | { USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */ | 980 | { USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */ |
| 981 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | 981 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ |
| 982 | }, | 982 | }, |
| 983 | { USB_DEVICE(0x0482, 0x0203), /* KYOCERA AH-K3001V */ | ||
| 984 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | ||
| 985 | }, | ||
| 983 | /* control interfaces with various AT-command sets */ | 986 | /* control interfaces with various AT-command sets */ |
| 984 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, | 987 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, |
| 985 | USB_CDC_ACM_PROTO_AT_V25TER) }, | 988 | USB_CDC_ACM_PROTO_AT_V25TER) }, |