diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-02 05:27:46 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-02 05:27:46 -0500 |
| commit | 156366d31524dc6b88836f06dccb1be13dbef5f1 (patch) | |
| tree | 5ae1fee7169edd9bebace22394f0777af21fca63 /sound/usb/usbaudio.h | |
| parent | 7f9320d415fab5c05097c77eea7a77f2f6341f24 (diff) | |
| parent | 0a566ec25627bdd360f7294aa2e52f9d121233b4 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Conflicts:
sound/usb/usbaudio.c
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 { | |||
| 75 | QUIRK_MIDI_US122L, | 75 | QUIRK_MIDI_US122L, |
| 76 | QUIRK_AUDIO_STANDARD_INTERFACE, | 76 | QUIRK_AUDIO_STANDARD_INTERFACE, |
| 77 | QUIRK_AUDIO_FIXED_ENDPOINT, | 77 | QUIRK_AUDIO_FIXED_ENDPOINT, |
| 78 | QUIRK_AUDIO_EDIROL_UA1000, | ||
| 79 | QUIRK_AUDIO_EDIROL_UAXX, | 78 | QUIRK_AUDIO_EDIROL_UAXX, |
| 80 | QUIRK_AUDIO_ALIGN_TRANSFER, | 79 | QUIRK_AUDIO_ALIGN_TRANSFER, |
| 81 | 80 | ||
| @@ -112,7 +111,7 @@ struct snd_usb_midi_endpoint_info { | |||
| 112 | 111 | ||
| 113 | /* for QUIRK_AUDIO/MIDI_STANDARD_INTERFACE, data is NULL */ | 112 | /* for QUIRK_AUDIO/MIDI_STANDARD_INTERFACE, data is NULL */ |
| 114 | 113 | ||
| 115 | /* for QUIRK_AUDIO_EDIROL_UA700_UA25/UA1000, data is NULL */ | 114 | /* for QUIRK_AUDIO_EDIROL_UAXX, data is NULL */ |
| 116 | 115 | ||
| 117 | /* for QUIRK_IGNORE_INTERFACE, data is NULL */ | 116 | /* for QUIRK_IGNORE_INTERFACE, data is NULL */ |
| 118 | 117 | ||