From: Hamish Guthrie <hcg@openwrt.org>
Date: Wed, 23 Mar 2011 14:08:33 +0000 (+0000)
Subject: Correct CTI patch
X-Git-Tag: reboot~17150
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d16f80c95d6895aae90e5047db065ea11b0e8c2d;p=openwrt%2Fstaging%2Fxback.git

Correct CTI patch

SVN-Revision: 26276
---

diff --git a/target/linux/omap35xx/patches-2.6.36/005-add_cti_usbids.patch b/target/linux/omap35xx/patches-2.6.36/005-add_cti_usbids.patch
index b27494e323..3ff9c6beec 100644
--- a/target/linux/omap35xx/patches-2.6.36/005-add_cti_usbids.patch
+++ b/target/linux/omap35xx/patches-2.6.36/005-add_cti_usbids.patch
@@ -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
---- 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
-@@ -794,9 +794,6 @@
+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.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,6 +794,9 @@
  	{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },
  	{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },
  	{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },
--	/* CTI Devices */
--	{ USB_DEVICE(FTDI_VID, FTDI_CTI_Mini_PID) },
--	{ USB_DEVICE(FTDI_VID, FTDI_CTI_Nano_PID) },
++	/* CTI Devices */
++	{ USB_DEVICE(FTDI_VID, FTDI_CTI_Mini_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_CTI_Nano_PID) },
  	{ },					/* Optional parameter 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
---- 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
-@@ -1100,7 +1100,3 @@
+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.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,3 +1100,7 @@
  #define FTDI_SCIENCESCOPE_LOGBOOKML_PID		0xFF18
  #define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID	0xFF1C
  #define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID	0xFF1D
--
--/* www.cti-lean.com RS485 converter */
--#define FTDI_CTI_Mini_PID	0xF608 /* USB-485 Mini */
--#define FTDI_CTI_Nano_PID	0xF60B /* USB-Nano-485 */
++
++/* www.cti-lean.com RS485 converter */
++#define FTDI_CTI_Mini_PID	0xF608 /* USB-485 Mini */
++#define FTDI_CTI_Nano_PID	0xF60B /* USB-Nano-485 */