diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-20 01:50:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-20 01:50:32 -0500 |
| commit | f31f40be8f82d5eeb4ca084f9ac0f11ca265876b (patch) | |
| tree | 6fce9ac78045249084d641945e094dcaea72d265 /drivers/usb/serial/usb-serial-simple.c | |
| parent | 13c12dbe3a2ce17227f7ddef652b6a53c78fa51f (diff) | |
| parent | 895be5b31e5175bef575008aadb4f0a27b850daa (diff) | |
Merge tag 'asoc-v3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.14
A few fixes, all driver speccific ones. The DaVinci ones aren't as
clear as they should be from the subject lines on the commits but they
fix issues which will prevent correct operation in some use cases and
only affect that particular driver so are reasonably safe.
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 */ |