diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 09:22:21 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 09:22:21 +0100 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /sound/isa/es18xx.c | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
| download | op-kernel-dev-66643de455c27973ac31ad6de9f859d399916842.zip op-kernel-dev-66643de455c27973ac31ad6de9f859d399916842.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'sound/isa/es18xx.c')
| -rw-r--r-- | sound/isa/es18xx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index a36ec1d..e6945db 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -85,6 +85,8 @@ #include <linux/pnp.h> #include <linux/isapnp.h> #include <linux/moduleparam.h> +#include <linux/delay.h> + #include <asm/io.h> #include <asm/dma.h> #include <sound/core.h> |
