diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /drivers/usb/serial/cp2101.c | |
| parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
| parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/usb/serial/cp2101.c')
| -rw-r--r-- | drivers/usb/serial/cp2101.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c index f3ca66017a03..324bb61d68ff 100644 --- a/drivers/usb/serial/cp2101.c +++ b/drivers/usb/serial/cp2101.c | |||
| @@ -75,6 +75,7 @@ static struct usb_device_id id_table [] = { | |||
| 75 | { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ | 75 | { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ |
| 76 | { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ | 76 | { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ |
| 77 | { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ | 77 | { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ |
| 78 | { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */ | ||
| 78 | { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ | 79 | { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ |
| 79 | { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ | 80 | { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ |
| 80 | { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */ | 81 | { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */ |