diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-pxa/palmtreo.c | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/palmtreo.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmtreo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c index bb27d4b688d..7346fbfa810 100644 --- a/arch/arm/mach-pxa/palmtreo.c +++ b/arch/arm/mach-pxa/palmtreo.c | |||
| @@ -440,7 +440,7 @@ static void __init centro_init(void) | |||
| 440 | } | 440 | } |
| 441 | 441 | ||
| 442 | MACHINE_START(TREO680, "Palm Treo 680") | 442 | MACHINE_START(TREO680, "Palm Treo 680") |
| 443 | .boot_params = 0xa0000100, | 443 | .atag_offset = 0x100, |
| 444 | .map_io = pxa27x_map_io, | 444 | .map_io = pxa27x_map_io, |
| 445 | .reserve = treo_reserve, | 445 | .reserve = treo_reserve, |
| 446 | .init_irq = pxa27x_init_irq, | 446 | .init_irq = pxa27x_init_irq, |
| @@ -450,7 +450,7 @@ MACHINE_START(TREO680, "Palm Treo 680") | |||
| 450 | MACHINE_END | 450 | MACHINE_END |
| 451 | 451 | ||
| 452 | MACHINE_START(CENTRO, "Palm Centro 685") | 452 | MACHINE_START(CENTRO, "Palm Centro 685") |
| 453 | .boot_params = 0xa0000100, | 453 | .atag_offset = 0x100, |
| 454 | .map_io = pxa27x_map_io, | 454 | .map_io = pxa27x_map_io, |
| 455 | .reserve = treo_reserve, | 455 | .reserve = treo_reserve, |
| 456 | .init_irq = pxa27x_init_irq, | 456 | .init_irq = pxa27x_init_irq, |