diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:34:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:34:16 -0500 |
| commit | 4567c4a89693416ccca02d32109bce967e9c1ade (patch) | |
| tree | 9d77cf02ce269ed5fc4b6e2ebddb9ad7fd504ad1 /arch/arm/mm | |
| parent | 602fd7c36728a04e61a442c9755e7d454501266c (diff) | |
| parent | 19d6c13b56a78b3757e747f469285c2a546d634a (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mm')
| -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 ea67be0223ac..3e8556b16a9f 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) | |||
| 881 | BOOTMEM_EXCLUSIVE); | 881 | BOOTMEM_EXCLUSIVE); |
| 882 | } | 882 | } |
| 883 | 883 | ||
| 884 | if (machine_is_treo680()) { | 884 | if (machine_is_treo680() || machine_is_centro()) { |
| 885 | reserve_bootmem_node(pgdat, 0xa0000000, 0x1000, | 885 | reserve_bootmem_node(pgdat, 0xa0000000, 0x1000, |
| 886 | BOOTMEM_EXCLUSIVE); | 886 | BOOTMEM_EXCLUSIVE); |
| 887 | reserve_bootmem_node(pgdat, 0xa2000000, 0x1000, | 887 | reserve_bootmem_node(pgdat, 0xa2000000, 0x1000, |