diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 08:41:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 08:41:25 -0700 |
| commit | 2214482cb00e6da1397c2ecde5b392490eb9637f (patch) | |
| tree | 7375817fa8b76741a0e362716b59860255e526ba /sound/usb/midi.h | |
| parent | 13da9e200fe4740b02cd51e07ab454627e228920 (diff) | |
| parent | d21921215af2fe33190a3b5b166b145e607e537d (diff) | |
| download | linux-2214482cb00e6da1397c2ecde5b392490eb9637f.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: emu10k1: allow high-resolution mixer controls
ALSA: pcm: fix delta calculation at boundary wraparound
ALSA: hda_intel: fix handling of non-completion stream interrupts
ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis
ALSA: hda: Fix model quirk for Dell M1730
ALSA: hda - iMac9,1 sound fixes
ALSA: hda: Use LPIB for Toshiba A100-259
ALSA: hda: Use LPIB for Acer Aspire 5110
ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise
ALSA: usb-audio: add support for Akai MPD16
ALSA: pcm: fix the fix of the runtime->boundary calculation
Diffstat (limited to 'sound/usb/midi.h')
| -rw-r--r-- | sound/usb/midi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/midi.h b/sound/usb/midi.h index 2089ec987c66..2fca80b744c0 100644 --- a/sound/usb/midi.h +++ b/sound/usb/midi.h @@ -37,6 +37,8 @@ struct snd_usb_midi_endpoint_info { /* for QUIRK_MIDI_CME, data is NULL */ +/* for QUIRK_MIDI_AKAI, data is NULL */ + int snd_usbmidi_create(struct snd_card *card, struct usb_interface *iface, struct list_head *midi_list, |