projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
[cascardo/linux.git]
/
drivers
/
usb
/
serial
/
ftdi_sio.c
diff --git
a/drivers/usb/serial/ftdi_sio.c
b/drivers/usb/serial/ftdi_sio.c
index
c45f9c0
..
b21d553
100644
(file)
--- a/
drivers/usb/serial/ftdi_sio.c
+++ b/
drivers/usb/serial/ftdi_sio.c
@@
-904,6
+904,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) },
{ } /* Terminating entry */
};