diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mach-shmobile/board-g3evm.c | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-shmobile/board-g3evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-g3evm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-g3evm.c b/arch/arm/mach-shmobile/board-g3evm.c index 8b620bf0622..72d557281b1 100644 --- a/arch/arm/mach-shmobile/board-g3evm.c +++ b/arch/arm/mach-shmobile/board-g3evm.c | |||
| @@ -261,8 +261,6 @@ static struct map_desc g3evm_io_desc[] __initdata = { | |||
| 261 | static void __init g3evm_map_io(void) | 261 | static void __init g3evm_map_io(void) |
| 262 | { | 262 | { |
| 263 | iotable_init(g3evm_io_desc, ARRAY_SIZE(g3evm_io_desc)); | 263 | iotable_init(g3evm_io_desc, ARRAY_SIZE(g3evm_io_desc)); |
| 264 | /* DMA memory at 0xf6000000 - 0xffdfffff */ | ||
| 265 | init_consistent_dma_size(158 << 20); | ||
| 266 | 264 | ||
| 267 | /* setup early devices and console here as well */ | 265 | /* setup early devices and console here as well */ |
| 268 | sh7367_add_early_devices(); | 266 | sh7367_add_early_devices(); |