patch-2.2.18 linux/drivers/sound/emu10k1/cardwi.h

Next file: linux/drivers/sound/emu10k1/cardwo.c
Previous file: linux/drivers/sound/emu10k1/cardwi.c
Back to the patch index
Back to the overall index

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/sound/emu10k1/cardwi.h linux/drivers/sound/emu10k1/cardwi.h
@@ -48,7 +48,6 @@
         u32 addrreg;
         u32 idxreg;
         u32 adcctl;
-	u32 fxwc;
 	void *addr;
 	u8 cov;
 	dma_addr_t dma_handle;	
@@ -66,18 +65,8 @@
 	u32 blocks;
 	spinlock_t lock;
 	u8 recsrc;
+	u16 fxwc;
 };
-
-struct emu10k1_wavein 
-{
-	struct wiinst *ac97;
-	struct wiinst *mic;
-	struct wiinst *fx;
-
-	u8 recsrc;
-	u32 fxwc;
-};
-
 
 #define WAVEIN_MAXBUFSIZE         65536
 #define WAVEIN_MINBUFSIZE	  368

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)