X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fsound%2Fmpu401.h;h=8e97ace78f1679b2d62501470cd2cf8439a2c8b2;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=ac504321ea5625775698a3735f9b5bbf252c418f;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/sound/mpu401.h b/include/sound/mpu401.h
index ac504321e..8e97ace78 100644
--- a/include/sound/mpu401.h
+++ b/include/sound/mpu401.h
@@ -45,12 +45,6 @@
 #define MPU401_HW_PC98II		18	/* Roland PC98II */
 #define MPU401_HW_AUREAL		19	/* Aureal Vortex */
 
-#define MPU401_INFO_INPUT	(1 << 0)	/* input stream */
-#define MPU401_INFO_OUTPUT	(1 << 1)	/* output stream */
-#define MPU401_INFO_INTEGRATED	(1 << 2)	/* integrated h/w port */
-#define MPU401_INFO_MMIO	(1 << 3)	/* MMIO access */
-#define MPU401_INFO_TX_IRQ	(1 << 4)	/* independent TX irq */
-
 #define MPU401_MODE_BIT_INPUT		0
 #define MPU401_MODE_BIT_OUTPUT		1
 #define MPU401_MODE_BIT_INPUT_TRIGGER	2
@@ -68,7 +62,6 @@ struct snd_mpu401 {
 	struct snd_rawmidi *rmidi;
 
 	unsigned short hardware;	/* MPU401_HW_XXXX */
-	unsigned int info_flags;	/* MPU401_INFO_XXX */
 	unsigned long port;		/* base port of MPU-401 chip */
 	unsigned long cport;		/* port + 1 (usually) */
 	struct resource *res;		/* port resource */
@@ -106,16 +99,13 @@ struct snd_mpu401 {
 
  */
 
-irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id,
-				      struct pt_regs *regs);
-irqreturn_t snd_mpu401_uart_interrupt_tx(int irq, void *dev_id,
-					 struct pt_regs *regs);
+irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 
 int snd_mpu401_uart_new(struct snd_card *card,
 			int device,
 			unsigned short hardware,
 			unsigned long port,
-			unsigned int info_flags,
+			int integrated,
 			int irq,
 			int irq_flags,
 			struct snd_rawmidi ** rrawmidi);