diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 19:42:45 +0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 19:42:45 +0400 |
commit | 8083e1656211eb1487329923d592ee061d08d7b3 (patch) | |
tree | 92a44787484996b82365fab21f2dec960ab4f2d3 /drivers/usb/serial | |
parent | 6b12a3d35ff6cb09f8b777ab258ea1e32c680d62 (diff) | |
parent | 1802ca745280b916cda4090e459741b8c9b3e8d0 (diff) | |
download | linux-8083e1656211eb1487329923d592ee061d08d7b3.tar.xz |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 15945e806f03..c6115aa1b445 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -506,6 +506,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) }, { USB_DEVICE(TESTO_VID, TESTO_USB_INTERFACE_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_GAMMA_SCOUT_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ }; diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 8888cd80a491..77299996f7ee 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h @@ -467,6 +467,11 @@ #define TESTO_VID 0x128D #define TESTO_USB_INTERFACE_PID 0x0001 +/* + * Gamma Scout (http://gamma-scout.com/). Submitted by rsc@runtux.com. + */ +#define FTDI_GAMMA_SCOUT_PID 0xD678 /* Gamma Scout online */ + /* Commands */ #define FTDI_SIO_RESET 0 /* Reset the port */ #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ |