diff options
author | 2011-10-08 21:07:42 +0200 | |
---|---|---|
committer | 2011-10-08 21:07:42 +0200 | |
commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-gemini/board-rut1xx.c | |
parent | Merge branch 'sirf/cleanup' into next/cleanup (diff) | |
parent | Merge branch 'for_3_2/for-rmk/arm_cpu_pm' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into devel-stable (diff) | |
download | linux-dev-71f2c153755442c05d15cd025484f676a5f3541f.tar.xz linux-dev-71f2c153755442c05d15cd025484f676a5f3541f.zip |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-gemini/board-rut1xx.c')
-rw-r--r-- | arch/arm/mach-gemini/board-rut1xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-gemini/board-rut1xx.c b/arch/arm/mach-gemini/board-rut1xx.c index 4fa09af99495..cd7437a1cea0 100644 --- a/arch/arm/mach-gemini/board-rut1xx.c +++ b/arch/arm/mach-gemini/board-rut1xx.c @@ -86,7 +86,7 @@ static void __init rut1xx_init(void) } MACHINE_START(RUT100, "Teltonika RUT100") - .boot_params = 0x100, + .atag_offset = 0x100, .map_io = gemini_map_io, .init_irq = gemini_init_irq, .timer = &rut1xx_timer, |