diff options
| author | Dan Williams | 2010-05-18 01:30:58 +0200 |
|---|---|---|
| committer | Dan Williams | 2010-05-18 01:30:58 +0200 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/dma/iop-adma.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 | kernel-qcow2-linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.gz kernel-qcow2-linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.xz kernel-qcow2-linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.zip | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/dma/iop-adma.c')
| -rw-r--r-- | drivers/dma/iop-adma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index e5d4b97b7fd5..161c452923b8 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c @@ -32,6 +32,7 @@ #include <linux/memory.h> #include <linux/ioport.h> #include <linux/raid/pq.h> +#include <linux/slab.h> #include <mach/adma.h> |