Merge branch 'master' into upstream-fixes

[pandora-kernel.git] / sound / oss / mpu401.c

diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index 0aac54c..58d4a5d 100644 (file)
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -1,5 +1,5 @@
 /*
- * sound/mpu401.c
+ * sound/oss/mpu401.c
  *
  * The low level driver for Roland MPU-401 compatible Midi cards.
  */
@@ -432,16 +432,7 @@ static void mpu401_input_loop(struct mpu_config *devc)
        devc->m_busy = 0;
 }
 
-int intchk_mpu401(void *dev_id)
-{
-       struct mpu_config *devc;
-       int dev = (int) dev_id;
-
-       devc = &dev_conf[dev];
-       return input_avail(devc);
-}
-
-irqreturn_t mpuintr(int irq, void *dev_id, struct pt_regs *dummy)
+static irqreturn_t mpuintr(int irq, void *dev_id)
 {
        struct mpu_config *devc;
        int dev = (int) dev_id;
@@ -1761,8 +1752,6 @@ static int mpu_timer_init(int midi_dev)
 EXPORT_SYMBOL(probe_mpu401);
 EXPORT_SYMBOL(attach_mpu401);
 EXPORT_SYMBOL(unload_mpu401);
-EXPORT_SYMBOL(intchk_mpu401);
-EXPORT_SYMBOL(mpuintr);
 
 static struct address_info cfg;