diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-10 20:37:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-10 20:37:17 -0400 |
| commit | 068ef739127af1faf6f342b56d41ceea89f76c75 (patch) | |
| tree | 1ce4cddcd4d4b6b4e3bf539e40e14f2ac3fb5c91 /drivers/dma | |
| parent | a0c49b6b6729723f32208acb59946d29c72539c6 (diff) | |
| parent | 4eb979d4d182c67acb6272a3a0244bf0027cf16b (diff) | |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: drop experimental status for ARM_PATCH_PHYS_VIRT
ARM: 7008/1: alignment: Make SIGBUS sent to userspace POSIXly correct
ARM: 7007/1: alignment: Prevent ignoring of faults with ARMv6 unaligned access model
ARM: 7010/1: mm: fix invalid loop for poison_init_mem
ARM: 7005/1: freshen up mm/proc-arm946.S
dmaengine: PL08x: Fix trivial build error
ARM: Fix build error for SMP=n builds
Diffstat (limited to 'drivers/dma')
| -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 196a7378d332..be21e3f138a8 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c | |||
| @@ -80,6 +80,7 @@ | |||
| 80 | #include <linux/interrupt.h> | 80 | #include <linux/interrupt.h> |
| 81 | #include <linux/slab.h> | 81 | #include <linux/slab.h> |
| 82 | #include <linux/delay.h> | 82 | #include <linux/delay.h> |
| 83 | #include <linux/dma-mapping.h> | ||
| 83 | #include <linux/dmapool.h> | 84 | #include <linux/dmapool.h> |
| 84 | #include <linux/dmaengine.h> | 85 | #include <linux/dmaengine.h> |
| 85 | #include <linux/amba/bus.h> | 86 | #include <linux/amba/bus.h> |