git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b85e9de)
usb: gadget: midi: convert to new interface of f_midi
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Thu, 16 Oct 2014 11:33:28 +0000 (13:33 +0200)
committerFelipe Balbi <balbi@ti.com>
Wed, 5 Nov 2014 19:36:13 +0000 (13:36 -0600)
Use the new f_midi interface so that the old can be removed.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/legacy/Kconfig patch | blob | history
drivers/usb/gadget/legacy/gmidi.c patch | blob | history

diff --git a/drivers/usb/gadget/legacy/Kconfig b/drivers/usb/gadget/legacy/Kconfig
index 24392d2..8011b19 100644 (file)
--- a/drivers/usb/gadget/legacy/Kconfig
+++ b/drivers/usb/gadget/legacy/Kconfig
@@ -287,6 +287,7 @@ config USB_MIDI_GADGET
        depends on SND
        select USB_LIBCOMPOSITE
        select SND_RAWMIDI
+       select USB_F_MIDI
        help
          The MIDI Gadget acts as a USB Audio device, with one MIDI
          input and one MIDI output. These MIDI jacks appear as
diff --cc drivers/usb/gadget/legacy/gmidi.c
Simple merge
Pandora Kernel Repository