diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
| commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
| tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /sound/isa/es18xx.c | |
| parent | 382066da251132f768380f4852ed5afb72d88f80 (diff) | |
| parent | a8bd60705aa17a998516837d9c1e503ad4cbd7fc (diff) | |
Merge branch 'master'
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 a36ec1daa5cb..e6945db8ed1b 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c | |||
| @@ -85,6 +85,8 @@ | |||
| 85 | #include <linux/pnp.h> | 85 | #include <linux/pnp.h> |
| 86 | #include <linux/isapnp.h> | 86 | #include <linux/isapnp.h> |
| 87 | #include <linux/moduleparam.h> | 87 | #include <linux/moduleparam.h> |
| 88 | #include <linux/delay.h> | ||
| 89 | |||
| 88 | #include <asm/io.h> | 90 | #include <asm/io.h> |
| 89 | #include <asm/dma.h> | 91 | #include <asm/dma.h> |
| 90 | #include <sound/core.h> | 92 | #include <sound/core.h> |