[generic] backport upstream Kernel commit 1ed2f73d90fb49bcf5704aee7e9084adb882bfc5...
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.31 / 822-usb_serial_option_add_more_devices.patch
1 --- a/drivers/usb/serial/option.c
2 +++ b/drivers/usb/serial/option.c
3 @@ -167,6 +167,7 @@ static int option_resume(struct usb_ser
4 #define HUAWEI_PRODUCT_E143E 0x143E
5 #define HUAWEI_PRODUCT_E143F 0x143F
6 #define HUAWEI_PRODUCT_E14AC 0x14AC
7 +#define HUAWEI_PRODUCT_E173S 0x1C05
8
9 #define QUANTA_VENDOR_ID 0x0408
10 #define QUANTA_PRODUCT_Q101 0xEA02
11 @@ -332,6 +333,7 @@ static int option_resume(struct usb_ser
12 /* ALCATEL PRODUCTS */
13 #define ALCATEL_VENDOR_ID 0x1bbb
14 #define ALCATEL_PRODUCT_X060S 0x0000
15 +#define ALCATEL_PRODUCT_X220D 0x0017
16
17 /* Airplus products */
18 #define AIRPLUS_VENDOR_ID 0x1011
19 @@ -439,6 +441,7 @@ static struct usb_device_id option_ids[]
20 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
21 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
22 { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) },
23 + { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S) },
24 { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },
25 { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
26 { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
27 @@ -639,6 +642,7 @@ static struct usb_device_id option_ids[]
28 { USB_DEVICE(ALINK_VENDOR_ID, 0xce16) },
29 { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
30 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) },
31 + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220D) },
32 { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
33 { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
34 { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },