aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbaudio.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-06-28 12:13:26 +0200
committerTakashi Iwai <tiwai@suse.de>2013-06-28 12:13:26 +0200
commitea70ee057cf373d45aab9b69370ce94a8b6a94b4 (patch)
tree45a92cdec4fc8fa9b1ec582f53b0a045e8bc3244 /sound/usb/usbaudio.h
parentad60d502fb8aaa3c1e011f4d72b8228f553d87a8 (diff)
parentb7f33917bcd993ff81f3f80b9dc1890fb7410c6d (diff)
downloadkernel_goldelico_gta04-ea70ee057cf373d45aab9b69370ce94a8b6a94b4.zip
kernel_goldelico_gta04-ea70ee057cf373d45aab9b69370ce94a8b6a94b4.tar.gz
kernel_goldelico_gta04-ea70ee057cf373d45aab9b69370ce94a8b6a94b4.tar.bz2
Merge branch 'full-roland-support' of git://git.alsa-project.org/alsa-kprivate into for-next
For adding support for many Roland and Yamaha devices: * 'full-roland-support' of git://git.alsa-project.org/alsa-kprivate: ALSA: usb-audio: add quirks for Roland QUAD/OCTO-CAPTURE ALSA: usb-audio: claim autodetected PCM interfaces all at once ALSA: usb-audio: remove superfluous Roland quirks ALSA: usb-audio: add MIDI port names for some Roland devices ALSA: usb-audio: add support for many Roland/Yamaha devices ALSA: usb-audio: detect implicit feedback on Roland devices ALSA: usb-audio: store protocol version in struct audioformat
Diffstat (limited to 'sound/usb/usbaudio.h')
-rw-r--r--sound/usb/usbaudio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index bc43bca..caabe9b 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -72,9 +72,11 @@ struct snd_usb_audio {
enum quirk_type {
QUIRK_IGNORE_INTERFACE,
QUIRK_COMPOSITE,
+ QUIRK_AUTODETECT,
QUIRK_MIDI_STANDARD_INTERFACE,
QUIRK_MIDI_FIXED_ENDPOINT,
QUIRK_MIDI_YAMAHA,
+ QUIRK_MIDI_ROLAND,
QUIRK_MIDI_MIDIMAN,
QUIRK_MIDI_NOVATION,
QUIRK_MIDI_RAW_BYTES,