diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 11:35:33 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 11:35:33 +0100 |
| commit | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch) | |
| tree | 794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /arch/arm/mm/mmu.c | |
| parent | Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' i... (diff) | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff) | |
| download | linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.tar.xz linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.zip | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mm/mmu.c')
| -rw-r--r-- | arch/arm/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 2427cdcd9098..8c7fbd19a4b3 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -881,7 +881,7 @@ void __init reserve_node_zero(pg_data_t *pgdat) BOOTMEM_EXCLUSIVE); } - if (machine_is_treo680()) { + if (machine_is_treo680() || machine_is_centro()) { reserve_bootmem_node(pgdat, 0xa0000000, 0x1000, BOOTMEM_EXCLUSIVE); reserve_bootmem_node(pgdat, 0xa2000000, 0x1000, |