diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:11:46 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 00:25:01 +0100 |
commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-vt8500/wm8505_7in.c | |
parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-vt8500/wm8505_7in.c')
-rw-r--r-- | arch/arm/mach-vt8500/wm8505_7in.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vt8500/wm8505_7in.c b/arch/arm/mach-vt8500/wm8505_7in.c index e73aadbcafd6..cf910a956080 100644 --- a/arch/arm/mach-vt8500/wm8505_7in.c +++ b/arch/arm/mach-vt8500/wm8505_7in.c @@ -68,7 +68,7 @@ void __init wm8505_7in_init(void) } MACHINE_START(WM8505_7IN_NETBOOK, "WM8505 7-inch generic netbook") - .boot_params = 0x00000100, + .atag_offset = 0x100, .reserve = wm8505_reserve_mem, .map_io = wm8505_map_io, .init_irq = wm8505_init_irq, |