patch-2.0.1 linux/drivers/sound/os.h

• Lines: 33
• Date: Sun Jun 30 11:43:41 1996
• Orig file: v2.0.0/linux/drivers/sound/os.h
• Orig date: Sun Mar 24 22:49:45 1996

diff -u --recursive --new-file v2.0.0/linux/drivers/sound/os.h linux/drivers/sound/os.h
@@ -18,14 +18,11 @@
 #include <linux/signal.h>
 #include <linux/fcntl.h>
 #include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/tty.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
 #include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/dma.h>
-#include <sys/kd.h>
 #include <linux/wait.h>
 #include <linux/malloc.h>
 #include <linux/string.h>
@@ -40,7 +37,7 @@
 #define TRUE	1
 
 struct snd_wait {
-	  int mode;
+	  int flags;
 	};
 
 extern int sound_alloc_dma(int chn, char *deviceID);
@@ -51,7 +48,7 @@
 #define RUNTIME_DMA_ALLOC
 
 extern caddr_t sound_mem_blocks[1024];
-extern int sound_num_blocks;
+extern int sound_nblocks;
 
 #undef PSEUDO_DMA_AUTOINIT
 #define ALLOW_BUFFER_MAPPING