From faf944fb35fadd1bf6284cf513d7610bd1956c9b Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 14 Aug 2008 08:25:40 -0500 Subject: [PATCH] --- yaml --- r: 108970 b: refs/heads/master c: c8fd2c37b99c55c8d24888e0ed9d5f4f73458c9c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/cdc-acm.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dc34078aed05..2bc2fd3e06f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77571f05a483c0259e42ba2f482c82debc9a63af +refs/heads/master: c8fd2c37b99c55c8d24888e0ed9d5f4f73458c9c diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c index efc4373ededb..382522eb1f7e 100644 --- a/trunk/drivers/usb/class/cdc-acm.c +++ b/trunk/drivers/usb/class/cdc-acm.c @@ -1362,6 +1362,9 @@ static struct usb_device_id acm_ids[] = { { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ }, + { USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */ + .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ + }, /* control interfaces with various AT-command sets */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,