diff options
| author | Greg Kroah-Hartman | 2012-08-27 16:15:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-08-27 16:15:30 +0200 |
| commit | a7bdf7fa33127bf08eb0810698bca607a9462df4 (patch) | |
| tree | 2f4be686e49710d10cc4f5ebc2d5f06ae030b9bd /drivers/usb/serial/ftdi_sio.c | |
| parent | usb: convert USB_QUIRK_RESET_MORPHS to USB_QUIRK_RESET (diff) | |
| parent | Linux 3.6-rc3 (diff) | |
| download | kernel-qcow2-linux-a7bdf7fa33127bf08eb0810698bca607a9462df4.tar.gz kernel-qcow2-linux-a7bdf7fa33127bf08eb0810698bca607a9462df4.tar.xz kernel-qcow2-linux-a7bdf7fa33127bf08eb0810698bca607a9462df4.zip | |
Merge v3.6-rc3 into usb-next
This picks up fixes that we need in this branch for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 70688cba95e3..29b81ad421fe 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -811,6 +811,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) }, { USB_DEVICE(PI_VID, PI_E861_PID) }, + { USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) }, { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |