diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /sound/isa/es18xx.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'sound/isa/es18xx.c')
| -rw-r--r-- | sound/isa/es18xx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 9a43baae7250..fb4d6b34bbca 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c | |||
| @@ -80,7 +80,6 @@ | |||
| 80 | #include <linux/init.h> | 80 | #include <linux/init.h> |
| 81 | #include <linux/err.h> | 81 | #include <linux/err.h> |
| 82 | #include <linux/isa.h> | 82 | #include <linux/isa.h> |
| 83 | #include <linux/slab.h> | ||
| 84 | #include <linux/pnp.h> | 83 | #include <linux/pnp.h> |
| 85 | #include <linux/isapnp.h> | 84 | #include <linux/isapnp.h> |
| 86 | #include <linux/moduleparam.h> | 85 | #include <linux/moduleparam.h> |