14 lines
683 B
Diff
14 lines
683 B
Diff
|
--- 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
|