summaryrefslogtreecommitdiffstats
path: root/sound/usb/midi.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-31 05:59:19 +0200
committerPaul Mundt <lethal@linux-sh.org>2010-05-31 05:59:19 +0200
commit8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch)
tree266c42b6687e68e4febb72d8c031e5facd899a1c /sound/usb/midi.h
parentsh: remove duplicated #include (diff)
parentLinux 2.6.35-rc1 (diff)
downloadlinux-8fa76f7e61ef4e5bc97207143ea4e198b22487bc.tar.xz
linux-8fa76f7e61ef4e5bc97207143ea4e198b22487bc.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/usb/midi.h')
-rw-r--r--sound/usb/midi.h2
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,