Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / sound / oss / mpu401.h

diff --git a/sound/oss/mpu401.h b/sound/oss/mpu401.h
index bdc5bde641e6b7fc56dfbb1b2e40df9bda0cf9bd..84c0e9522ef7e674cc75e86606e5585b3aae410c 100644 (file)
--- a/sound/oss/mpu401.h
+++ b/sound/oss/mpu401.h
@@ -10,5 +10,3 @@ int probe_mpu401(struct address_info *hw_config, struct resource *ports);
 int attach_mpu401(struct address_info * hw_config, struct module *owner);
 void unload_mpu401(struct address_info *hw_info);
 
-int intchk_mpu401(void *dev_id);
-irqreturn_t mpuintr(int irq, void *dev_id, struct pt_regs * dummy);