merge 3G usb serial card patches and move it at 802
[openwrt/openwrt.git] / target / linux / generic-2.4 / patches / 802-usb_serial_3g_cards.patch
1 --- linux/drivers/usb/serial/usbserial.c.old 2006-05-15 18:16:55.000000000 +0300
2 +++ linux/drivers/usb/serial/usbserial.c 2006-05-15 18:19:06.000000000 +0300
3 @@ -332,7 +332,7 @@
4 static __u16 vendor = 0x05f9;
5 static __u16 product = 0xffff;
6
7 -static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
8 +static struct usb_device_id generic_device_ids[10]; /* Initially all zeroes. */
9
10 /* All of the device info needed for the Generic Serial Converter */
11 static struct usb_serial_device_type generic_device = {
12 @@ -1793,6 +1793,34 @@
13 generic_device_ids[0].idVendor = vendor;
14 generic_device_ids[0].idProduct = product;
15 generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
16 + /* Option 3G/UMTS 'Colt' */
17 + generic_device_ids[1].idVendor = 0x0af0;
18 + generic_device_ids[1].idProduct = 0x5000;
19 + generic_device_ids[1].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
20 + /* Option 3G/UMTS 'Fusion' */
21 + generic_device_ids[2].idVendor = 0x0af0;
22 + generic_device_ids[2].idProduct = 0x6000;
23 + generic_device_ids[2].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
24 + /* Option 3G/UMTS 'Fusion2' */
25 + generic_device_ids[3].idVendor = 0x0af0;
26 + generic_device_ids[3].idProduct = 0x6300;
27 + generic_device_ids[3].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
28 + /* Audiovox Aircard */
29 + generic_device_ids[4].idVendor = 0x0f3d;
30 + generic_device_ids[4].idProduct = 0x0112;
31 + generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
32 + /* Sierra Wireless AirCard 875 */
33 + generic_device_ids[5].idVendor = 0x1199;
34 + generic_device_ids[5].idProduct = 0x6820;
35 + generic_device_ids[5].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
36 + /* Huawei E600 */
37 + generic_device_ids[6].idVendor = 0x12d1;
38 + generic_device_ids[6].idProduct = 0x1001;
39 + generic_device_ids[6].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
40 + /* Merlin XU870 */
41 + generic_device_ids[7].idVendor = 0x1410;
42 + generic_device_ids[7].idProduct = 0x1430;
43 + generic_device_ids[7].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
44 /* register our generic driver with ourselves */
45 usb_serial_register (&generic_device);
46 #endif