diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /arch/arm/mach-bcmring/dma.c | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (diff) | |
| parent | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (diff) | |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/arm/mach-bcmring/dma.c')
| -rw-r--r-- | arch/arm/mach-bcmring/dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c index b52b8de91bde..f4d4d6d174d0 100644 --- a/arch/arm/mach-bcmring/dma.c +++ b/arch/arm/mach-bcmring/dma.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
| 37 | #include <linux/pfn.h> | 37 | #include <linux/pfn.h> |
| 38 | #include <linux/atomic.h> | 38 | #include <linux/atomic.h> |
| 39 | #include <linux/sched.h> | ||
| 39 | #include <mach/dma.h> | 40 | #include <mach/dma.h> |
| 40 | 41 | ||
| 41 | /* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */ | 42 | /* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */ |