mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-09-20 19:51:42 +00:00
USB: ftdi_sio: Add support for GE Healthcare Nemo Tracker device
commit 9c491c372d
upstream.
Signed-off-by: Taylor Braun-Jones <taylor.braun-jones@ge.com>
Cc: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>
This commit is contained in:
parent
32b45e0ec8
commit
0d69cbb4a9
|
@ -960,6 +960,8 @@ static struct usb_device_id id_table_combined [] = {
|
|||
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
|
||||
/* ekey Devices */
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) },
|
||||
/* GE Healthcare devices */
|
||||
{ USB_DEVICE(GE_HEALTHCARE_VID, GE_HEALTHCARE_NEMO_TRACKER_PID) },
|
||||
{ }, /* Optional parameter entry */
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
|
|
|
@ -1382,3 +1382,9 @@
|
|||
* ekey biometric systems GmbH (http://ekey.net/)
|
||||
*/
|
||||
#define FTDI_EKEY_CONV_USB_PID 0xCB08 /* Converter USB */
|
||||
|
||||
/*
|
||||
* GE Healthcare devices
|
||||
*/
|
||||
#define GE_HEALTHCARE_VID 0x1901
|
||||
#define GE_HEALTHCARE_NEMO_TRACKER_PID 0x0015
|
||||
|
|
Loading…
Reference in a new issue