diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-20 08:29:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-20 08:29:21 +0200 |
| commit | b2c16e1efddeb517c62d242fb8ec30a383843468 (patch) | |
| tree | fbfbe6f124a9423abf9a288ad46feb6db7469c42 /drivers/usb/serial/usb-serial-simple.c | |
| parent | 81539169f283329fd8bc58457cc15754f683ba69 (diff) | |
| parent | d2ffb0103aaefa9b169da042cf39ce27bfb6cdbb (diff) | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/serial/usb-serial-simple.c')
| -rw-r--r-- | drivers/usb/serial/usb-serial-simple.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c index a204782ae530..e98b6e57b703 100644 --- a/drivers/usb/serial/usb-serial-simple.c +++ b/drivers/usb/serial/usb-serial-simple.c @@ -54,7 +54,8 @@ DEVICE(funsoft, FUNSOFT_IDS); /* Infineon Flashloader driver */ #define FLASHLOADER_IDS() \ { USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \ - { USB_DEVICE(0x8087, 0x0716) } + { USB_DEVICE(0x8087, 0x0716) }, \ + { USB_DEVICE(0x8087, 0x0801) } DEVICE(flashloader, FLASHLOADER_IDS); /* Google Serial USB SubClass */ |