diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /sound/usb/usbaudio.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/usb/usbaudio.h')
| -rw-r--r-- | sound/usb/usbaudio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index ecd724bfe5a5..88733524d0fb 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h | |||
| @@ -161,7 +161,7 @@ enum quirk_type { | |||
| 161 | QUIRK_MIDI_NOVATION, | 161 | QUIRK_MIDI_NOVATION, |
| 162 | QUIRK_MIDI_RAW, | 162 | QUIRK_MIDI_RAW, |
| 163 | QUIRK_MIDI_EMAGIC, | 163 | QUIRK_MIDI_EMAGIC, |
| 164 | QUIRK_MIDI_MIDITECH, | 164 | QUIRK_MIDI_CME, |
| 165 | QUIRK_AUDIO_STANDARD_INTERFACE, | 165 | QUIRK_AUDIO_STANDARD_INTERFACE, |
| 166 | QUIRK_AUDIO_FIXED_ENDPOINT, | 166 | QUIRK_AUDIO_FIXED_ENDPOINT, |
| 167 | QUIRK_AUDIO_EDIROL_UA700_UA25, | 167 | QUIRK_AUDIO_EDIROL_UA700_UA25, |
| @@ -209,7 +209,7 @@ struct snd_usb_midi_endpoint_info { | |||
| 209 | /* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info | 209 | /* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info |
| 210 | * structure (out_cables and in_cables only) */ | 210 | * structure (out_cables and in_cables only) */ |
| 211 | 211 | ||
| 212 | /* for QUIRK_MIDI_MIDITECH, data is NULL */ | 212 | /* for QUIRK_MIDI_CME, data is NULL */ |
| 213 | 213 | ||
| 214 | /* | 214 | /* |
| 215 | */ | 215 | */ |