diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /drivers/sound/os.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'drivers/sound/os.h')
| -rw-r--r-- | drivers/sound/os.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/sound/os.h b/drivers/sound/os.h index 5bd4a27eb..31fcc81f7 100644 --- a/drivers/sound/os.h +++ b/drivers/sound/os.h @@ -18,6 +18,7 @@ #include <linux/string.h> #include <linux/fs.h> #include <asm/dma.h> +#include <asm/io.h> #include <asm/param.h> #include <linux/ptrace.h> #include <linux/sched.h> @@ -32,7 +33,6 @@ #include <asm/uaccess.h> #include <linux/poll.h> #include <linux/pci.h> -#include <linux/bios32.h> #endif #include <linux/wrapper.h> @@ -52,7 +52,6 @@ extern void reprogram_timer(void); #define USE_AUTOINIT_DMA extern caddr_t sound_mem_blocks[1024]; -extern int sound_mem_sizes[1024]; extern int sound_nblocks; #undef PSEUDO_DMA_AUTOINIT |