diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 10:54:51 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 10:54:51 +0100 |
commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-pxa/cm-x300.c | |
parent | Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable (diff) | |
parent | ARM: remove boot_params from struct machine_desc (diff) | |
download | linux-dev-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.tar.xz linux-dev-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.zip |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/cm-x300.c')
-rw-r--r-- | arch/arm/mach-pxa/cm-x300.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index b6a51340270b..9ac0225cd51b 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c @@ -852,7 +852,7 @@ static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags, } MACHINE_START(CM_X300, "CM-X300 module") - .boot_params = 0xa0000100, + .atag_offset = 0x100, .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .handle_irq = pxa3xx_handle_irq, |