diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:50 +0100 |
| commit | a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (patch) | |
| tree | 5d9ecc2dd903ed506c58a31f1076b2df500a6fe0 /sound/usb/usbaudio.h | |
| parent | f0f20a16983f7d3713ab695e19bd15eca4e7533f (diff) | |
| parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/usb/usbaudio.h')
| -rw-r--r-- | sound/usb/usbaudio.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 6b016d4aac6b..42c299cbf63a 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -75,7 +75,6 @@ enum quirk_type { QUIRK_MIDI_US122L, QUIRK_AUDIO_STANDARD_INTERFACE, QUIRK_AUDIO_FIXED_ENDPOINT, - QUIRK_AUDIO_EDIROL_UA1000, QUIRK_AUDIO_EDIROL_UAXX, QUIRK_AUDIO_ALIGN_TRANSFER, @@ -112,7 +111,7 @@ struct snd_usb_midi_endpoint_info { /* for QUIRK_AUDIO/MIDI_STANDARD_INTERFACE, data is NULL */ -/* for QUIRK_AUDIO_EDIROL_UA700_UA25/UA1000, data is NULL */ +/* for QUIRK_AUDIO_EDIROL_UAXX, data is NULL */ /* for QUIRK_IGNORE_INTERFACE, data is NULL */ |