diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-02 14:11:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-02 14:23:57 +0200 |
| commit | 8e9ed8b02490fea577b1eb1704c05bf43c891ed7 (patch) | |
| tree | 3c0cc5dd498abcf0cc894e85509c131a0dde9a43 /drivers/usb/serial/ftdi_sio.c | |
| parent | 716a42348cdaf04534b15fbdc9c83e25baebfed5 (diff) | |
| parent | 07903af152b0597d94e9b0030746b63c4664e787 (diff) | |
| download | talos-op-linux-8e9ed8b02490fea577b1eb1704c05bf43c891ed7.tar.gz talos-op-linux-8e9ed8b02490fea577b1eb1704c05bf43c891ed7.zip | |
Merge branch 'sched/urgent' into sched/core
Merge reason: avoid upcoming patch conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 60c64cc5be2a..b574878c78b2 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -698,6 +698,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, + { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ }; |
