diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2009-03-06 17:07:43 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-17 17:01:28 -0400 |
commit | b0d659002168146ec6b03d1ef062d8dcf05ff510 (patch) | |
tree | 5f27ff914673244bb50e572e34669c042a443f44 /drivers/usb/serial/ftdi_sio.c | |
parent | 7f82b6dd7015aabca2fd55fb690248f742cd67f3 (diff) |
USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index f77339265ee6..ae84c326a540 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -666,6 +666,8 @@ static struct usb_device_id id_table_combined [] = { | |||
666 | { USB_DEVICE(ATMEL_VID, STK541_PID) }, | 666 | { USB_DEVICE(ATMEL_VID, STK541_PID) }, |
667 | { USB_DEVICE(DE_VID, STB_PID) }, | 667 | { USB_DEVICE(DE_VID, STB_PID) }, |
668 | { USB_DEVICE(DE_VID, WHT_PID) }, | 668 | { USB_DEVICE(DE_VID, WHT_PID) }, |
669 | { USB_DEVICE(ADI_VID, ADI_GNICE_PID), | ||
670 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
669 | { }, /* Optional parameter entry */ | 671 | { }, /* Optional parameter entry */ |
670 | { } /* Terminating entry */ | 672 | { } /* Terminating entry */ |
671 | }; | 673 | }; |