kernel: add a recent upstream commit (post-3.3) to the ssb update patch, required...
[openwrt/openwrt.git] / target / linux / generic / patches-2.6.30 / 822-usb_serial_option_add_more_devices.patch
1 --- a/drivers/usb/serial/option.c
2 +++ b/drivers/usb/serial/option.c
3 @@ -161,6 +161,7 @@ static int option_resume(struct usb_ser
4 #define HUAWEI_PRODUCT_E143D 0x143D
5 #define HUAWEI_PRODUCT_E143E 0x143E
6 #define HUAWEI_PRODUCT_E143F 0x143F
7 +#define HUAWEI_PRODUCT_E173S 0x1C05
8
9 #define QUANTA_VENDOR_ID 0x0408
10 #define QUANTA_PRODUCT_Q101 0xEA02
11 @@ -179,6 +180,10 @@ static int option_resume(struct usb_ser
12 /* MERLIN EVDO PRODUCTS */
13 #define NOVATELWIRELESS_PRODUCT_V640 0x1100
14 #define NOVATELWIRELESS_PRODUCT_V620 0x1110
15 +#define HUAWEI_PRODUCT_K3770 0x14C9
16 +#define HUAWEI_PRODUCT_K3771 0x14CA
17 +#define HUAWEI_PRODUCT_K4510 0x14CB
18 +#define HUAWEI_PRODUCT_K4511 0x14CC
19 #define NOVATELWIRELESS_PRODUCT_V740 0x1120
20 #define NOVATELWIRELESS_PRODUCT_V720 0x1130
21
22 @@ -304,6 +309,10 @@ static int option_resume(struct usb_ser
23 #define DLINK_VENDOR_ID 0x1186
24 #define DLINK_PRODUCT_DWM_652 0x3e04
25
26 +/* ALCATEL PRODUCTS */
27 +#define ALCATEL_VENDOR_ID 0x1bbb
28 +#define ALCATEL_PRODUCT_X220D 0x0017
29 +
30
31 static struct usb_device_id option_ids[] = {
32 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
33 @@ -401,7 +410,16 @@ static struct usb_device_id option_ids[]
34 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143C, 0xff, 0xff, 0xff) },
35 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
36 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
37 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) },
38 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) },
39 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) },
40 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x32) },
41 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x31) },
42 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x32) },
43 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x31) },
44 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x32) },
45 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
46 + { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S) },
47 { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },
48 { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
49 { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
50 @@ -523,6 +541,7 @@ static struct usb_device_id option_ids[]
51 { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
52 { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
53 { USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */
54 + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220D) },
55 { } /* Terminating entry */
56 };
57 MODULE_DEVICE_TABLE(usb, option_ids);