diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /sound/isa/es18xx.c | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
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> |