diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-18 22:00:42 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-18 22:00:42 (GMT) |
| commit | 07f1c295de593ec0b0dca3092299c048c03374da (patch) | |
| tree | ad8f291e550b3315f84c07e9f543e25adcf95dc3 /arch/arm/mach-shark | |
| parent | 4aa96ccf9ee35cdbd0d423e87a4d551019570218 (diff) | |
| parent | fb89fcfb151698776be6c900aec8161b01990e92 (diff) | |
| download | linux-fsl-qoriq-07f1c295de593ec0b0dca3092299c048c03374da.tar.xz | |
Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-shark')
| -rw-r--r-- | arch/arm/mach-shark/core.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-shark/include/mach/memory.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index 5cf7f94..ac2873c 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c @@ -156,4 +156,5 @@ MACHINE_START(SHARK, "Shark") .map_io = shark_map_io, .init_irq = shark_init_irq, .timer = &shark_timer, + .dma_zone_size = SZ_4M, MACHINE_END diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h index 4c0831f8..1cf8d69 100644 --- a/arch/arm/mach-shark/include/mach/memory.h +++ b/arch/arm/mach-shark/include/mach/memory.h @@ -17,8 +17,6 @@ */ #define PLAT_PHYS_OFFSET UL(0x08000000) -#define ARM_DMA_ZONE_SIZE SZ_4M - /* * Cache flushing area */ |