From 28c64b2c8191cf30928921ac2fdd3b35943440d0 Mon Sep 17 00:00:00 2001 From: Iain McFarlane Date: Sun, 4 May 2008 00:13:49 +0100 Subject: [PATCH] --- yaml --- r: 96621 b: refs/heads/master c: 6149ed5e3a6207595bd7362af7724d64f44af216 h: refs/heads/master i: 96619: 2a309d7004adf08457c4925ccd90fe2a52ef74c4 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 5d35997129e6..2b65e4f081e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c7d3137fe4fce634d55a6e99c95dff4c6306702 +refs/heads/master: 6149ed5e3a6207595bd7362af7724d64f44af216 diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c index cefe7f2c6f75..63c34043b4d9 100644 --- a/trunk/drivers/usb/class/cdc-acm.c +++ b/trunk/drivers/usb/class/cdc-acm.c @@ -1248,6 +1248,9 @@ static struct usb_device_id acm_ids[] = { { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ }, + { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */ + .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,