diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 01:30:58 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 01:30:58 +0200 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /sound/isa/opti9xx/miro.c | |
| parent | DMAENGINE: extend the control command to include an arg (diff) | |
| parent | async_tx: trim dma_async_tx_descriptor in 'no channel switch' case (diff) | |
| download | linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.xz linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.zip | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'sound/isa/opti9xx/miro.c')
| -rw-r--r-- | sound/isa/opti9xx/miro.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 5913717c1be6..8c24102d0d93 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c @@ -27,7 +27,6 @@ #include <linux/isa.h> #include <linux/pnp.h> #include <linux/delay.h> -#include <linux/slab.h> #include <linux/ioport.h> #include <linux/moduleparam.h> #include <asm/io.h> |