Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 131174
b: refs/heads/master
c: e38c287
h: refs/heads/master
v: v3
  • Loading branch information
Stephane Clerambault authored and Greg Kroah-Hartman committed Feb 9, 2009
1 parent 325b1fc commit d8ef766
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 78c8fb3717cdff35ad118e17ac7495d0cf21a61f
refs/heads/master: e38c287447e5a3ff905a59dd81269c14cd12ffa1
1 change: 1 addition & 0 deletions trunk/drivers/usb/serial/ftdi_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) },
{ USB_DEVICE(ALTI2_VID, ALTI2_N3_PID) },
{ USB_DEVICE(FTDI_VID, DIEBOLD_BCS_SE923_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_NDI_HUC_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/usb/serial/ftdi_sio.h
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,9 @@
#define TML_VID 0x1B91 /* Vendor ID */
#define TML_USB_SERIAL_PID 0x0064 /* USB - Serial Converter */

/* NDI Polaris System */
#define FTDI_NDI_HUC_PID 0xDA70

/* Propox devices */
#define FTDI_PROPOX_JTAGCABLEII_PID 0xD738

Expand Down

0 comments on commit d8ef766

Please sign in to comment.