aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorАлексей Крамаренко <alexeyk13@yandex.ru>2013-11-01 17:26:38 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-13 12:05:30 +0900
commita73e47ff525d2a69d61767a5928ba00937f77e1b (patch)
treefb0d3b10e9dabb964cda2268eb9d74264ecb03e7 /drivers/usb/serial/ftdi_sio.c
parent59fa93ea76e2de29910bab0a49dbb14f56b79aea (diff)
downloadlinux-linaro-stable-a73e47ff525d2a69d61767a5928ba00937f77e1b.tar.gz
USB: serial: ftdi_sio: add id for Z3X Box device
commit e1466ad5b1aeda303f9282463d55798d2eda218c upstream. Custom VID/PID for Z3X Box device, popular tool for cellphone flashing. Signed-off-by: Alexey E. Kramarenko <alexeyk13@yandex.ru> 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index b65e657c641d..aa3aed5458a6 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -906,6 +906,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
/* Crucible Devices */
{ USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};