diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 18:09:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 18:09:07 -0400 |
| commit | 3ad55155b222f2a901405dea20ff7c68828ecd92 (patch) | |
| tree | 53b24c981387b037084a333dc5ae23be8e82ef4a /arch/arm/mach-shark | |
| parent | 06f365acef5ca54fd5708a0d853c4a89609536f1 (diff) | |
| parent | 6645cb61f3a1186a71475385d33f875dd8fb38bf (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/entry-armv.S
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 5cf7f94c1f31..ac2873c8014b 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c | |||
| @@ -156,4 +156,5 @@ MACHINE_START(SHARK, "Shark") | |||
| 156 | .map_io = shark_map_io, | 156 | .map_io = shark_map_io, |
| 157 | .init_irq = shark_init_irq, | 157 | .init_irq = shark_init_irq, |
| 158 | .timer = &shark_timer, | 158 | .timer = &shark_timer, |
| 159 | .dma_zone_size = SZ_4M, | ||
| 159 | MACHINE_END | 160 | MACHINE_END |
diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h index 4c0831f83b0c..1cf8d6962617 100644 --- a/arch/arm/mach-shark/include/mach/memory.h +++ b/arch/arm/mach-shark/include/mach/memory.h | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | */ | 17 | */ |
| 18 | #define PLAT_PHYS_OFFSET UL(0x08000000) | 18 | #define PLAT_PHYS_OFFSET UL(0x08000000) |
| 19 | 19 | ||
| 20 | #define ARM_DMA_ZONE_SIZE SZ_4M | ||
| 21 | |||
| 22 | /* | 20 | /* |
| 23 | * Cache flushing area | 21 | * Cache flushing area |
| 24 | */ | 22 | */ |