diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/usb/class/cdc-acm.c | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
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 cefe7f2c6f75..63c34043b4d9 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1248,6 +1248,9 @@ static struct usb_device_id acm_ids[] = { | |||
| 1248 | { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */ | 1248 | { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */ |
| 1249 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | 1249 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ |
| 1250 | }, | 1250 | }, |
| 1251 | { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */ | ||
| 1252 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | ||
| 1253 | }, | ||
| 1251 | 1254 | ||
| 1252 | /* control interfaces with various AT-command sets */ | 1255 | /* control interfaces with various AT-command sets */ |
| 1253 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, | 1256 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, |