Merge branch 'fix/misc' into topic/usb

[safe/jmp/linux-2.6] / sound / usb / midi.c

diff --git a/sound/usb/usbmidi.c b/sound/usb/midi.c
similarity index 99%
rename from sound/usb/usbmidi.c
rename to sound/usb/midi.c
index 9e28b20..2c1558c 100644 (file)
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/midi.c
@@ -53,7 +53,8 @@
 #include <sound/rawmidi.h>
 #include <sound/asequencer.h>
 #include "usbaudio.h"
-
+#include "midi.h"
+#include "helper.h"
 
 /*
  * define this to log all USB packets