diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:33 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:33 +0900 |
commit | f1e0477a7b7a541f51eea279910eed4ddd010033 (patch) | |
tree | 552841f13496306f0140d5faca82ae9987a81b5e /drivers/dma/amba-pl08x.c | |
parent | b58c580d996655658975aa8042b43b7d579f3986 (diff) | |
parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'drivers/dma/amba-pl08x.c')
-rw-r--r-- | drivers/dma/amba-pl08x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 196a7378d33..be21e3f138a 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -80,6 +80,7 @@ #include <linux/interrupt.h> #include <linux/slab.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <linux/dmapool.h> #include <linux/dmaengine.h> #include <linux/amba/bus.h> |