diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:01:44 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:01:44 +0800 |
| commit | 2e67ba554184199114a948786e47decb8b9a469b (patch) | |
| tree | 1ed97bafe8b2c58171dceb88c6a6f1ff86f52084 /drivers/usb/serial/ftdi_sio_ids.h | |
| parent | e5dd309b741e2e4d7e71da61e07249f91c80065e (diff) | |
| parent | ac3d826bef907afe35f80ecccbcdd57223df4b88 (diff) | |
Merge tag 'v3.18.45' into linux-linaro-lsk-v3.18lsk-v3.18-16.12
This is the 3.18.45 stable release
Diffstat (limited to 'drivers/usb/serial/ftdi_sio_ids.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 48db84f25cc9..db1a9b3a5f38 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h @@ -626,8 +626,9 @@ /* * Infineon Technologies */ -#define INFINEON_VID 0x058b -#define INFINEON_TRIBOARD_PID 0x0028 /* DAS JTAG TriBoard TC1798 V1.0 */ +#define INFINEON_VID 0x058b +#define INFINEON_TRIBOARD_TC1798_PID 0x0028 /* DAS JTAG TriBoard TC1798 V1.0 */ +#define INFINEON_TRIBOARD_TC2X7_PID 0x0043 /* DAS JTAG TriBoard TC2X7 V1.0 */ /* * Acton Research Corp. |