summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/littleton.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-10-24 21:02:37 +0200
committerRob Herring <rob.herring@calxeda.com>2011-10-24 21:02:37 +0200
commit3a8254364277fabe01bc0e12b9691722939f5ef3 (patch)
tree0befa43780509144cc840f767859006409e0506d /arch/arm/mach-pxa/littleton.c
parentLinux 3.1-rc9 (diff)
parentMerge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platform... (diff)
downloadlinux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.xz
linux-3a8254364277fabe01bc0e12b9691722939f5ef3.zip
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-pxa/littleton.c')
-rw-r--r--arch/arm/mach-pxa/littleton.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
index 8f97e15e86e5..0037e57e0cec 100644
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
@@ -437,7 +437,7 @@ static void __init littleton_init(void)
}
MACHINE_START(LITTLETON, "Marvell Form Factor Development Platform (aka Littleton)")
- .boot_params = 0xa0000100,
+ .atag_offset = 0x100,
.map_io = pxa3xx_map_io,
.nr_irqs = LITTLETON_NR_IRQS,
.init_irq = pxa3xx_init_irq,