summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.4/patches
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-09 18:21:36 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-09 18:21:36 +0000
commit4577be54822f9eb39eb888df1f8af4c7759c7216 (patch)
treebfaf7418994c4672cbe68a2f9cd4566952197976 /target/linux/generic-2.4/patches
parenteb34b5dcf0049fb0d8bbf78de0485843d8a2c134 (diff)
Add Merlin XU870 (#1303)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8715 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.4/patches')
-rw-r--r--target/linux/generic-2.4/patches/802-merlin_xu870.patch13
1 files changed, 13 insertions, 0 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
new file mode 100644
index 000000000..cea718f97
--- /dev/null
+++ b/target/linux/generic-2.4/patches/802-merlin_xu870.patch
@@ -0,0 +1,13 @@
+--- 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