diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
| commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
| tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /drivers/usb/serial/ftdi_sio.h | |
| parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
| parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ | |||
| 467 | #define TESTO_VID 0x128D | 467 | #define TESTO_VID 0x128D |
| 468 | #define TESTO_USB_INTERFACE_PID 0x0001 | 468 | #define TESTO_USB_INTERFACE_PID 0x0001 |
| 469 | 469 | ||
| 470 | /* | ||
| 471 | * Gamma Scout (http://gamma-scout.com/). Submitted by rsc@runtux.com. | ||
| 472 | */ | ||
| 473 | #define FTDI_GAMMA_SCOUT_PID 0xD678 /* Gamma Scout online */ | ||
| 474 | |||
| 470 | /* Commands */ | 475 | /* Commands */ |
| 471 | #define FTDI_SIO_RESET 0 /* Reset the port */ | 476 | #define FTDI_SIO_RESET 0 /* Reset the port */ |
| 472 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ | 477 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ |