From a96234644d5a7959ba9d19d0e31bed4f4570ecf2 Mon Sep 17 00:00:00 2001
From: Pavel Kazlou
Date: Thu, 22 Jul 2010 03:22:20 +0300
Subject: [PATCH] --- yaml --- r: 208035 b: refs/heads/master c:
b972302b0a13aaddc9e90da2b4b52722e5d0e776 h: refs/heads/master i: 208033:
1531ea8f75497e7bd02fca3fbe0d4fb28aac1a23 208031:
f99281bc907e6f22435e5a008f469c144d05e704 v: v3
---
[refs] | 2 +-
trunk/drivers/usb/serial/option.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/[refs] b/[refs]
index 6a2ae6c4ac80..a068ce309463 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
---
-refs/heads/master: 93362a875fc69881ae69299efaf19a55a1f57db0
+refs/heads/master: b972302b0a13aaddc9e90da2b4b52722e5d0e776
diff --git a/trunk/drivers/usb/serial/option.c b/trunk/drivers/usb/serial/option.c
index a8c54b2116a6..051c00ce5d2a 100644
--- a/trunk/drivers/usb/serial/option.c
+++ b/trunk/drivers/usb/serial/option.c
@@ -146,6 +146,7 @@ static void option_instat_callback(struct urb *urb);
#define HUAWEI_PRODUCT_E143E 0x143E
#define HUAWEI_PRODUCT_E143F 0x143F
#define HUAWEI_PRODUCT_E14AC 0x14AC
+#define HUAWEI_PRODUCT_ETS1220 0x1803
#define QUANTA_VENDOR_ID 0x0408
#define QUANTA_PRODUCT_Q101 0xEA02
@@ -479,6 +480,7 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
+ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) },
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) },
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */