| 1 | --- a/drivers/usb/serial/usbserial.c |
| 2 | +++ b/drivers/usb/serial/usbserial.c |
| 3 | @@ -333,7 +333,7 @@ static __u16 vendor = 0x05f9; |
| 4 | static __u16 product = 0xffff; |
| 5 | static int maxSize = 0; |
| 6 | |
| 7 | -static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ |
| 8 | +static struct usb_device_id generic_device_ids[9]; /* 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 | @@ -1836,6 +1836,30 @@ static int __init usb_serial_init(void) |
| 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 | + /* Huawei E600 */ |
| 33 | + generic_device_ids[6].idVendor = 0x12d1; |
| 34 | + generic_device_ids[6].idProduct = 0x1001; |
| 35 | + generic_device_ids[6].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; |
| 36 | + /* Merlin XU870 */ |
| 37 | + generic_device_ids[7].idVendor = 0x1410; |
| 38 | + generic_device_ids[7].idProduct = 0x1430; |
| 39 | + generic_device_ids[7].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; |
| 40 | /* register our generic driver with ourselves */ |
| 41 | usb_serial_register (&generic_device); |
| 42 | #endif |
| 43 | |
