mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-27 15:31:05 +02:00
[omap35xx]: Correct CTI patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26276 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
d88135f883
commit
4a907deb73
@ -1,24 +1,24 @@
|
|||||||
diff -urN linux-2.6.36.1/drivers/usb/serial/ftdi_sio.c linux-2.6.36.1.old/drivers/usb/serial/ftdi_sio.c
|
diff -urN linux-2.6.36.1.old/drivers/usb/serial/ftdi_sio.c linux-2.6.36.1/drivers/usb/serial/ftdi_sio.c
|
||||||
--- linux-2.6.36.1/drivers/usb/serial/ftdi_sio.c 2011-03-23 11:23:23.000000000 +0100
|
--- linux-2.6.36.1.old/drivers/usb/serial/ftdi_sio.c 2010-11-22 20:03:49.000000000 +0100
|
||||||
+++ linux-2.6.36.1.old/drivers/usb/serial/ftdi_sio.c 2010-11-22 20:03:49.000000000 +0100
|
+++ linux-2.6.36.1/drivers/usb/serial/ftdi_sio.c 2011-03-23 11:23:23.000000000 +0100
|
||||||
@@ -794,9 +794,6 @@
|
@@ -794,6 +794,9 @@
|
||||||
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },
|
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },
|
||||||
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },
|
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },
|
||||||
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },
|
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },
|
||||||
- /* CTI Devices */
|
+ /* CTI Devices */
|
||||||
- { USB_DEVICE(FTDI_VID, FTDI_CTI_Mini_PID) },
|
+ { USB_DEVICE(FTDI_VID, FTDI_CTI_Mini_PID) },
|
||||||
- { USB_DEVICE(FTDI_VID, FTDI_CTI_Nano_PID) },
|
+ { USB_DEVICE(FTDI_VID, FTDI_CTI_Nano_PID) },
|
||||||
{ }, /* Optional parameter entry */
|
{ }, /* Optional parameter entry */
|
||||||
{ } /* Terminating entry */
|
{ } /* Terminating entry */
|
||||||
};
|
};
|
||||||
diff -urN linux-2.6.36.1/drivers/usb/serial/ftdi_sio_ids.h linux-2.6.36.1.old/drivers/usb/serial/ftdi_sio_ids.h
|
diff -urN linux-2.6.36.1.old/drivers/usb/serial/ftdi_sio_ids.h linux-2.6.36.1/drivers/usb/serial/ftdi_sio_ids.h
|
||||||
--- linux-2.6.36.1/drivers/usb/serial/ftdi_sio_ids.h 2011-03-23 11:20:57.000000000 +0100
|
--- linux-2.6.36.1.old/drivers/usb/serial/ftdi_sio_ids.h 2010-11-22 20:03:49.000000000 +0100
|
||||||
+++ linux-2.6.36.1.old/drivers/usb/serial/ftdi_sio_ids.h 2010-11-22 20:03:49.000000000 +0100
|
+++ linux-2.6.36.1/drivers/usb/serial/ftdi_sio_ids.h 2011-03-23 11:20:57.000000000 +0100
|
||||||
@@ -1100,7 +1100,3 @@
|
@@ -1100,3 +1100,7 @@
|
||||||
#define FTDI_SCIENCESCOPE_LOGBOOKML_PID 0xFF18
|
#define FTDI_SCIENCESCOPE_LOGBOOKML_PID 0xFF18
|
||||||
#define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID 0xFF1C
|
#define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID 0xFF1C
|
||||||
#define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID 0xFF1D
|
#define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID 0xFF1D
|
||||||
-
|
+
|
||||||
-/* www.cti-lean.com RS485 converter */
|
+/* www.cti-lean.com RS485 converter */
|
||||||
-#define FTDI_CTI_Mini_PID 0xF608 /* USB-485 Mini */
|
+#define FTDI_CTI_Mini_PID 0xF608 /* USB-485 Mini */
|
||||||
-#define FTDI_CTI_Nano_PID 0xF60B /* USB-Nano-485 */
|
+#define FTDI_CTI_Nano_PID 0xF60B /* USB-Nano-485 */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user