Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / sound / oss / v_midi.c

diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c
index 077b7679766590c52bd0d2390fd117f919aa8f39..d952b2264da1da46fc0cb70e4e7228b0cf0f4817 100644 (file)
--- a/sound/oss/v_midi.c
+++ b/sound/oss/v_midi.c
@@ -1,5 +1,5 @@
 /*
- * sound/v_midi.c
+ * sound/oss/v_midi.c
  *
  * The low level driver for the Sound Blaster DS chips.
  *
@@ -39,8 +39,6 @@ static void *midi_mem = NULL;
  */
 
 
-void            (*midi_input_intr) (int dev, unsigned char data);
-
 static int v_midi_open (int dev, int mode,
              void            (*input) (int dev, unsigned char data),
              void            (*output) (int dev)