diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 14:02:37 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 14:02:37 -0500 |
commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-omap1/board-nokia770.c | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
download | talos-op-linux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.gz talos-op-linux-3a8254364277fabe01bc0e12b9691722939f5ef3.zip |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-omap1/board-nokia770.c')
-rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 5469ce247ffe..6825635ac681 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -264,7 +264,7 @@ static void __init omap_nokia770_map_io(void) } MACHINE_START(NOKIA770, "Nokia 770") - .boot_params = 0x10000100, + .atag_offset = 0x100, .map_io = omap_nokia770_map_io, .reserve = omap_reserve, .init_irq = omap_nokia770_init_irq, |