Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 223492
b: refs/heads/master
c: 5363cdc
h: refs/heads/master
v: v3
  • Loading branch information
Florian Faber authored and Greg Kroah-Hartman committed Dec 10, 2010
1 parent f8b4274 commit 073747b
Show file tree
Hide file tree
Showing 3 changed files with 7 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: f8bbeabc34aa945ab4275abc9a4dfde0aea798ca
refs/heads/master: 5363cdc3c5da9bd431552cf5989ab481596f0c6d
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 @@ -796,6 +796,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) },
{ USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID),
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ }, /* Optional parameter entry */
Expand Down
5 changes: 5 additions & 0 deletions trunk/drivers/usb/serial/ftdi_sio_ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,11 @@
#define MJSG_XM_RADIO_PID 0x937A
#define MJSG_HD_RADIO_PID 0x937C

/*
* D.O.Tec products (http://www.directout.eu)
*/
#define FTDI_DOTEC_PID 0x9868

/*
* Xverve Signalyzer tools (http://www.signalyzer.com/)
*/
Expand Down

0 comments on commit 073747b

Please sign in to comment.