diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
| commit | 9528454f9c02fb9c359c4c42c69eed4d47407e39 (patch) | |
| tree | 40e8c7f829b528073d2b216c3b8e6be205c76245 /sound/isa | |
| parent | 777e1d4a0f3387933f668e7adc81384827975189 (diff) | |
| parent | 1faadface9c5d000bb16e42c89f24859337cf2db (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'sound/isa')
| -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 a36ec1daa5c..e6945db8ed1 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> |