diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-04 03:44:10 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-04 03:44:10 -0500 |
| commit | dab2310d9d90eded48625c5382c6a60389bf8ca9 (patch) | |
| tree | 9327cc815d69dec23aebf03407e3fa82b6d2fbaa /drivers/usb/serial/usb-serial-simple.c | |
| parent | a3dbeb5b45af5b6113385db89fce2a8279278e8b (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge tag 'v3.14-rc5' into HEAD
Linux 3.14-rc5
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 f112b079ddfc..fb79775447b0 100644 --- a/drivers/usb/serial/usb-serial-simple.c +++ b/drivers/usb/serial/usb-serial-simple.c | |||
| @@ -71,7 +71,8 @@ DEVICE(hp4x, HP4X_IDS); | |||
| 71 | 71 | ||
| 72 | /* Suunto ANT+ USB Driver */ | 72 | /* Suunto ANT+ USB Driver */ |
| 73 | #define SUUNTO_IDS() \ | 73 | #define SUUNTO_IDS() \ |
| 74 | { USB_DEVICE(0x0fcf, 0x1008) } | 74 | { USB_DEVICE(0x0fcf, 0x1008) }, \ |
| 75 | { USB_DEVICE(0x0fcf, 0x1009) } /* Dynastream ANT USB-m Stick */ | ||
| 75 | DEVICE(suunto, SUUNTO_IDS); | 76 | DEVICE(suunto, SUUNTO_IDS); |
| 76 | 77 | ||
| 77 | /* Siemens USB/MPI adapter */ | 78 | /* Siemens USB/MPI adapter */ |