diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-05 17:10:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-05 17:10:52 -0400 |
| commit | 13efdbecc65ef6ec4028551fb223dea5c5e3143c (patch) | |
| tree | 634a2ce082abe3eb2a5defe0f1ddc2f3eb10f085 /drivers/usb/serial/ftdi_sio.c | |
| parent | 61f4a10cb4e9447a85245c63b3e7f46e09299fed (diff) | |
| parent | 6fd210a9cc398ecbff7bcdbe220651b73b654f56 (diff) | |
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable
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 [] = { | |||
| 698 | { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), | 698 | { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), |
| 699 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 699 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 700 | { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, | 700 | { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, |
| 701 | { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) }, | ||
| 701 | { }, /* Optional parameter entry */ | 702 | { }, /* Optional parameter entry */ |
| 702 | { } /* Terminating entry */ | 703 | { } /* Terminating entry */ |
| 703 | }; | 704 | }; |