diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-09-17 15:22:12 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-09-17 15:22:12 +0000 |
| commit | 2351f08272882dd5c7df5936ed186bdda3bf417e (patch) | |
| tree | 6ac35448f1a6433aad375f5c350470b66d4cbfca /target/linux/generic-2.4 | |
| parent | 9dcc512502ae50558d5c5aae9b40e90d0b09d4fa (diff) | |
| download | master-187ad058-2351f08272882dd5c7df5936ed186bdda3bf417e.tar.gz master-187ad058-2351f08272882dd5c7df5936ed186bdda3bf417e.tar.bz2 master-187ad058-2351f08272882dd5c7df5936ed186bdda3bf417e.zip | |
merge 3G usb serial card patches and move it at 802
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8827 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.4')
| -rw-r--r-- | target/linux/generic-2.4/patches/802-merlin_xu870.patch | 13 | ||||
| -rw-r--r-- | target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch (renamed from target/linux/generic-2.4/patches/220-usbserial_3g_cards.patch) | 26 |
2 files changed, 15 insertions, 24 deletions
diff --git a/target/linux/generic-2.4/patches/802-merlin_xu870.patch b/target/linux/generic-2.4/patches/802-merlin_xu870.patch deleted file mode 100644 index cea718f971..0000000000 --- a/target/linux/generic-2.4/patches/802-merlin_xu870.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic-2.4/patches/220-usbserial_3g_cards.patch b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch index 9119b83a0e..fbbb95883c 100644 --- a/target/linux/generic-2.4/patches/220-usbserial_3g_cards.patch +++ b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch @@ -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 |