diff options
| author |   Ian Abbott <abbotti@mev.co.uk> | 2005-07-29 12:16:31 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 13:12:52 -0700 |
| commit | 9b1513d91e195af46b8e59626f74d3d41a7565af (patch) | |
| tree | 1641fb53fb4fb3562fe44a3dd271b940147161f8 /drivers/usb/serial/ftdi_sio.c | |
| parent | [PATCH] PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug? (diff) | |
| download | linux-dev-9b1513d91e195af46b8e59626f74d3d41a7565af.tar.xz linux-dev-9b1513d91e195af46b8e59626f74d3d41a7565af.zip | |
[PATCH] USB: ftdi_sio: new microHAM and Evolution Robotics devices
The attached patch adds the following new devices to the ftdi_sio driver:
* microHAM USB-Y6 and USB-Y8 devices submitted by Justin Burket (KL1RL).
* Evolution Robotics ER1 Control Module submitted by Shawn M. Lavelle.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 0b03ddab53d9..cfb77ceced58 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -429,6 +429,9 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) }, { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) }, + { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, { } /* Terminating entry */ }; |