Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~andy/linux] / drivers / staging / line6 / midi.h

diff --git a/drivers/staging/line6/midi.h b/drivers/staging/line6/midi.h
index 19dabd54051afe0bbb31fe11e5b4206e36f790c8..78f903fb4d415a98969a8132b7bc0687faf42837 100644 (file)
--- a/drivers/staging/line6/midi.h
+++ b/drivers/staging/line6/midi.h
@@ -57,12 +57,12 @@ struct snd_line6_midi {
        /**
                 Buffer for incoming MIDI stream.
        */
-       struct MidiBuffer midibuf_in;
+       struct midi_buffer midibuf_in;
 
        /**
                 Buffer for outgoing MIDI stream.
        */
-       struct MidiBuffer midibuf_out;
+       struct midi_buffer midibuf_out;
 };
 
 extern int line6_init_midi(struct usb_line6 *line6);