diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-01-25 19:15:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:44:40 -0500 |
commit | 210b1975795d4661127144365a889a7a4f2cf1fa (patch) | |
tree | 8136a3e5d5967d2e1378f4d2bc92c4fef21d767e /drivers/usb/serial | |
parent | 9da88d78bcb5610a4bb9e0e10dfb31cc9b4fdb1b (diff) |
USB: remove duplicate device id from ftdi_sio
As pointed out by Kay Sievers <kay.sievers@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 35cad4249e51..4695952b6470 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -464,7 +464,6 @@ static struct usb_device_id id_table_combined [] = { | |||
464 | { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) }, | 464 | { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) }, |
465 | { USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) }, | 465 | { USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) }, |
466 | { USB_DEVICE(FTDI_VID, EVER_ECO_PRO_CDS) }, | 466 | { USB_DEVICE(FTDI_VID, EVER_ECO_PRO_CDS) }, |
467 | { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_0_PID) }, | ||
468 | { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID) }, | 467 | { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID) }, |
469 | { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) }, | 468 | { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) }, |
470 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_0_PID) }, | 469 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_0_PID) }, |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 40dd394de58d..7eff1c03ba80 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -364,7 +364,6 @@ | |||
364 | * USB-TTY activ, USB-TTY passiv. Some PIDs are used by several devices | 364 | * USB-TTY activ, USB-TTY passiv. Some PIDs are used by several devices |
365 | * and I'm not entirely sure which are used by which. | 365 | * and I'm not entirely sure which are used by which. |
366 | */ | 366 | */ |
367 | #define FTDI_4N_GALAXY_DE_0_PID 0x8372 | ||
368 | #define FTDI_4N_GALAXY_DE_1_PID 0xF3C0 | 367 | #define FTDI_4N_GALAXY_DE_1_PID 0xF3C0 |
369 | #define FTDI_4N_GALAXY_DE_2_PID 0xF3C1 | 368 | #define FTDI_4N_GALAXY_DE_2_PID 0xF3C1 |
370 | 369 | ||