diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index ba68835d06a6..3ae3ff36e4aa 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -584,6 +584,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 584 | /* | 584 | /* |
| 585 | * ELV devices: | 585 | * ELV devices: |
| 586 | */ | 586 | */ |
| 587 | { USB_DEVICE(FTDI_ELV_VID, FTDI_ELV_WS300_PID) }, | ||
| 587 | { USB_DEVICE(FTDI_VID, FTDI_ELV_USR_PID) }, | 588 | { USB_DEVICE(FTDI_VID, FTDI_ELV_USR_PID) }, |
| 588 | { USB_DEVICE(FTDI_VID, FTDI_ELV_MSM1_PID) }, | 589 | { USB_DEVICE(FTDI_VID, FTDI_ELV_MSM1_PID) }, |
| 589 | { USB_DEVICE(FTDI_VID, FTDI_ELV_KL100_PID) }, | 590 | { USB_DEVICE(FTDI_VID, FTDI_ELV_KL100_PID) }, |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index fa5d56038276..7c89cfcb85bb 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -204,7 +204,7 @@ | |||
| 204 | 204 | ||
| 205 | /* | 205 | /* |
| 206 | * ELV USB devices submitted by Christian Abt of ELV (www.elv.de). | 206 | * ELV USB devices submitted by Christian Abt of ELV (www.elv.de). |
| 207 | * All of these devices use FTDI's vendor ID (0x0403). | 207 | * Almost all of these devices use FTDI's vendor ID (0x0403). |
| 208 | * Further IDs taken from ELV Windows .inf file. | 208 | * Further IDs taken from ELV Windows .inf file. |
| 209 | * | 209 | * |
| 210 | * The previously included PID for the UO 100 module was incorrect. | 210 | * The previously included PID for the UO 100 module was incorrect. |
| @@ -212,6 +212,8 @@ | |||
| 212 | * | 212 | * |
| 213 | * Armin Laeuger originally sent the PID for the UM 100 module. | 213 | * Armin Laeuger originally sent the PID for the UM 100 module. |
| 214 | */ | 214 | */ |
| 215 | #define FTDI_ELV_VID 0x1B1F /* ELV AG */ | ||
| 216 | #define FTDI_ELV_WS300_PID 0xC006 /* eQ3 WS 300 PC II */ | ||
| 215 | #define FTDI_ELV_USR_PID 0xE000 /* ELV Universal-Sound-Recorder */ | 217 | #define FTDI_ELV_USR_PID 0xE000 /* ELV Universal-Sound-Recorder */ |
| 216 | #define FTDI_ELV_MSM1_PID 0xE001 /* ELV Mini-Sound-Modul */ | 218 | #define FTDI_ELV_MSM1_PID 0xE001 /* ELV Mini-Sound-Modul */ |
| 217 | #define FTDI_ELV_KL100_PID 0xE002 /* ELV Kfz-Leistungsmesser KL 100 */ | 219 | #define FTDI_ELV_KL100_PID 0xE002 /* ELV Kfz-Leistungsmesser KL 100 */ |
