projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| e64aea84 GKH |
1 | From c6c1e4491dc8d1ed2509fa6aacffa7f34614fc38 Mon Sep 17 00:00:00 2001 |
| 2 | From: Bruno Thomsen <bruno.thomsen@gmail.com> | |
| 3 | Date: Tue, 21 Feb 2012 23:41:37 +0100 | |
| 4 | Subject: USB: Added Kamstrup VID/PIDs to cp210x serial driver. | |
| 5 | ||
| 6 | From: Bruno Thomsen <bruno.thomsen@gmail.com> | |
| 7 | ||
| 8 | commit c6c1e4491dc8d1ed2509fa6aacffa7f34614fc38 upstream. | |
| 9 | ||
| 10 | Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com> | |
| 11 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 12 | ||
| 13 | --- | |
| 14 | drivers/usb/serial/cp210x.c | 2 ++ | |
| 15 | 1 file changed, 2 insertions(+) | |
| 16 | ||
| 17 | --- a/drivers/usb/serial/cp210x.c | |
| 18 | +++ b/drivers/usb/serial/cp210x.c | |
| 19 | @@ -136,6 +136,8 @@ static const struct usb_device_id id_tab | |
| 20 | { USB_DEVICE(0x16DC, 0x0011) }, /* W-IE-NE-R Plein & Baus GmbH RCM Remote Control for MARATON Power Supply */ | |
| 21 | { USB_DEVICE(0x16DC, 0x0012) }, /* W-IE-NE-R Plein & Baus GmbH MPOD Multi Channel Power Supply */ | |
| 22 | { USB_DEVICE(0x16DC, 0x0015) }, /* W-IE-NE-R Plein & Baus GmbH CML Control, Monitoring and Data Logger */ | |
| 23 | + { USB_DEVICE(0x17A8, 0x0001) }, /* Kamstrup Optical Eye/3-wire */ | |
| 24 | + { USB_DEVICE(0x17A8, 0x0005) }, /* Kamstrup M-Bus Master MultiPort 250D */ | |
| 25 | { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ | |
| 26 | { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ | |
| 27 | { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ |