diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-04 04:01:51 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-04 04:01:51 -0500 |
| commit | e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e (patch) | |
| tree | f3527603df92dfb34abfe7fc40968241f1af673e /arch/arm/mach-shmobile/board-ag5evm.c | |
| parent | cfef0320ead7d707c363b18bb6f13f6c3bda316a (diff) | |
| parent | 9561f4e052a06167694e110d76ce3a5e38b59522 (diff) | |
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 = { | |||
| 466 | static void __init ag5evm_map_io(void) | 466 | static void __init ag5evm_map_io(void) |
| 467 | { | 467 | { |
| 468 | iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc)); | 468 | iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc)); |
| 469 | /* DMA memory at 0xf6000000 - 0xffdfffff */ | ||
| 470 | init_consistent_dma_size(158 << 20); | ||
| 471 | 469 | ||
| 472 | /* setup early devices and console here as well */ | 470 | /* setup early devices and console here as well */ |
| 473 | sh73a0_add_early_devices(); | 471 | sh73a0_add_early_devices(); |