ChangeSet 1.1673.8.38, 2004/03/26 13:33:56-08:00, greg@kroah.com

USB: ftdi_sio merge fixups.


 drivers/usb/serial/ftdi_sio.c |    1 -
 drivers/usb/serial/ftdi_sio.h |    5 -----
 2 files changed, 6 deletions(-)


diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.c	Wed Apr 14 14:37:03 2004
+++ b/drivers/usb/serial/ftdi_sio.c	Wed Apr 14 14:37:03 2004
@@ -452,7 +452,6 @@
 	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88E_PID, 0x400, 0xffff) },
 	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88F_PID, 0x400, 0xffff) },
 	{ USB_DEVICE_VER(FTDI_VID, FTDI_ELV_UO100_PID, 0x400, 0xffff) },
-	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_889_PID, 0x400, 0xffff) },
 	{ }						/* Terminating entry */
 };
 
diff -Nru a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
--- a/drivers/usb/serial/ftdi_sio.h	Wed Apr 14 14:37:03 2004
+++ b/drivers/usb/serial/ftdi_sio.h	Wed Apr 14 14:37:03 2004
@@ -182,11 +182,6 @@
 #define FTDI_GUDEADS_E88E_PID    0xE88E
 #define FTDI_GUDEADS_E88F_PID    0xE88F
 
-/* 
- * Gude Analog- und Digitalsysteme GmbH
- */
-#define FTDI_GUDEADS_889_PID    0xe889  /* USB RS323 OptoBridge */ 
-
 /* Commands */
 #define FTDI_SIO_RESET 		0 /* Reset the port */
 #define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */