diff options
| author | Russell King | 2012-01-04 10:01:51 +0100 |
|---|---|---|
| committer | Russell King | 2012-01-04 10:01:51 +0100 |
| commit | e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e (patch) | |
| tree | f3527603df92dfb34abfe7fc40968241f1af673e /arch/arm/mach-shmobile/board-ag5evm.c | |
| parent | ARM: 7261/1: clocksource/ux500-prcmu: fix sched_clock breakage (diff) | |
| parent | Revert "ARM: move VMALLOC_END down temporarily for shmobile" (diff) | |
| download | kernel-qcow2-linux-e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e.tar.gz kernel-qcow2-linux-e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e.tar.xz kernel-qcow2-linux-e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e.zip | |
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-shmobile/board-ag5evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ag5evm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c index 202c3c6ec9d8..83c270949465 100644 --- a/arch/arm/mach-shmobile/board-ag5evm.c +++ b/arch/arm/mach-shmobile/board-ag5evm.c @@ -466,8 +466,6 @@ static struct map_desc ag5evm_io_desc[] __initdata = { static void __init ag5evm_map_io(void) { iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc)); - /* DMA memory at 0xf6000000 - 0xffdfffff */ - init_consistent_dma_size(158 << 20); /* setup early devices and console here as well */ sh73a0_add_early_devices(); |