Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 209893
b: refs/heads/master
c: 666cc07
h: refs/heads/master
i:
  209891: eff71d3
v: v3
  • Loading branch information
Martin Michlmayr authored and Greg Kroah-Hartman committed Aug 24, 2010
1 parent 22e89f2 commit bff460c
Show file tree
Hide file tree
Showing 3 changed files with 9 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: fd6e5bbb241720715cee737f534496d7c0ae9022
refs/heads/master: 666cc076d284e32d11bfc5ea2fbfc50434cff051
2 changes: 2 additions & 0 deletions trunk/drivers/usb/serial/ftdi_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH4_PID),
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ USB_DEVICE(FTDI_VID, SEGWAY_RMP200_PID) },
{ USB_DEVICE(IONICS_VID, IONICS_PLUGCOMPUTER_PID),
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
Expand Down
6 changes: 6 additions & 0 deletions trunk/drivers/usb/serial/ftdi_sio_ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,12 @@
#define ALTI2_VID 0x1BC9
#define ALTI2_N3_PID 0x6001 /* Neptune 3 */

/*
* Ionics PlugComputer
*/
#define IONICS_VID 0x1c0c
#define IONICS_PLUGCOMPUTER_PID 0x0102

/*
* Dresden Elektronik Sensor Terminal Board
*/
Expand Down

0 comments on commit bff460c

Please sign in to comment.