Merge Btrfs into fs/btrfs

[firefly-linux-kernel-4.4.55.git] / sound / drivers / virmidi.c

diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index 70e70baa3bc8f0e801ce9addabf1c40c83a137ea..f79e3614079d238aca26df870c863949bbda1e94 100644 (file)
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -41,10 +41,8 @@
  * - Run application using a midi device (eg. /dev/snd/midiC1D0)
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/wait.h>
-#include <linux/sched.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/moduleparam.h>
@@ -146,7 +144,7 @@ static struct platform_driver snd_virmidi_driver = {
        },
 };
 
-static void __init_or_module snd_virmidi_unregister_all(void)
+static void snd_virmidi_unregister_all(void)
 {
        int i;