merge 3G usb serial card patches and move it at 802
SVN-Revision: 8827
This commit is contained in:
		@@ -1,13 +0,0 @@
 | 
			
		||||
--- linux-2.4.34/drivers/usb/serial/usbserial.c		2007-09-07 19:15:58.000000000 +0200
 | 
			
		||||
+++ linux-2.4.34.new/drivers/usb/serial/usbserial.c	2007-09-09 20:19:21.000000000 +0200
 | 
			
		||||
@@ -1860,6 +1860,10 @@
 | 
			
		||||
 	generic_device_ids[6].idVendor = 0x1199;
 | 
			
		||||
 	generic_device_ids[6].idProduct = 0x6820;
 | 
			
		||||
 	generic_device_ids[6].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
+	/* Merlin XU870 */
 | 
			
		||||
+	generic_device_ids[7].idVendor = 0x1410;
 | 
			
		||||
+	generic_device_ids[7].idProduct = 0x1430;
 | 
			
		||||
+	generic_device_ids[7].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
 	/* register our generic driver with ourselves */
 | 
			
		||||
 	usb_serial_register (&generic_device);
 | 
			
		||||
 #endif
 | 
			
		||||
@@ -5,11 +5,11 @@
 | 
			
		||||
 static __u16	product	= 0xffff;
 | 
			
		||||
 
 | 
			
		||||
-static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
 | 
			
		||||
+static struct usb_device_id generic_device_ids[9]; /* Initially all zeroes. */
 | 
			
		||||
+static struct usb_device_id generic_device_ids[10]; /* Initially all zeroes. */
 | 
			
		||||
 
 | 
			
		||||
 /* All of the device info needed for the Generic Serial Converter */
 | 
			
		||||
 static struct usb_serial_device_type generic_device = {
 | 
			
		||||
@@ -1793,6 +1793,30 @@
 | 
			
		||||
@@ -1793,6 +1793,34 @@
 | 
			
		||||
 	generic_device_ids[0].idVendor = vendor;
 | 
			
		||||
 	generic_device_ids[0].idProduct = product;
 | 
			
		||||
 	generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
@@ -25,18 +25,22 @@
 | 
			
		||||
+	generic_device_ids[3].idVendor = 0x0af0;
 | 
			
		||||
+	generic_device_ids[3].idProduct = 0x6300;
 | 
			
		||||
+	generic_device_ids[3].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
+	/* Huawei E600 */
 | 
			
		||||
+	generic_device_ids[4].idVendor = 0x12d1;
 | 
			
		||||
+	generic_device_ids[4].idProduct = 0x1001;
 | 
			
		||||
+	generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
+	/* Audiovox Aircard */
 | 
			
		||||
+	generic_device_ids[5].idVendor = 0x0f3d;
 | 
			
		||||
+	generic_device_ids[5].idProduct = 0x0112;
 | 
			
		||||
+	generic_device_ids[5].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
+	generic_device_ids[4].idVendor = 0x0f3d;
 | 
			
		||||
+	generic_device_ids[4].idProduct = 0x0112;
 | 
			
		||||
+	generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
+	/* Sierra Wireless AirCard 875 */
 | 
			
		||||
+	generic_device_ids[6].idVendor = 0x1199;
 | 
			
		||||
+	generic_device_ids[6].idProduct = 0x6820;
 | 
			
		||||
+	generic_device_ids[5].idVendor = 0x1199;
 | 
			
		||||
+	generic_device_ids[5].idProduct = 0x6820;
 | 
			
		||||
+	generic_device_ids[5].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
+	/* Huawei E600 */
 | 
			
		||||
+	generic_device_ids[6].idVendor = 0x12d1;
 | 
			
		||||
+	generic_device_ids[6].idProduct = 0x1001;
 | 
			
		||||
+	generic_device_ids[6].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
+	/* Merlin XU870 */
 | 
			
		||||
+	generic_device_ids[7].idVendor = 0x1410;
 | 
			
		||||
+	generic_device_ids[7].idProduct = 0x1430;
 | 
			
		||||
+	generic_device_ids[7].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 | 
			
		||||
 	/* register our generic driver with ourselves */
 | 
			
		||||
 	usb_serial_register (&generic_device);
 | 
			
		||||
 #endif
 | 
			
		||||
		Reference in New Issue
	
	Block a user