diff options
author | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
tree | 04c065ace8c62953441bc22079b93449b996f283 /drivers/usb/serial/ftdi_sio.c | |
parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
download | linux-29f147d746326e4db5fe350c70373081d61a2965.tar.gz |
Merge branch 'merge'
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index f5851db67f5be8..82151207d81467 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -308,6 +308,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = { static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SIO_PID) }, { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) }, @@ -493,6 +494,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) }, { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) }, { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) }, { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) }, { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, { }, /* Optional parameter entry */ |