diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:53 -0400 |
| commit | 5839fec9d8db35b2b07359b18a77295418e239ad (patch) | |
| tree | f060f613c7d76b2784a93c96b7b8cd3f0d201254 /arch/arm/mach-tegra/board-harmony.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-tegra/board-harmony.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index 846cd7d69e3e..a4d1980e697a 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c | |||
| @@ -179,7 +179,7 @@ static void __init tegra_harmony_init(void) | |||
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | MACHINE_START(HARMONY, "harmony") | 181 | MACHINE_START(HARMONY, "harmony") |
| 182 | .boot_params = 0x00000100, | 182 | .atag_offset = 0x100, |
| 183 | .fixup = tegra_harmony_fixup, | 183 | .fixup = tegra_harmony_fixup, |
| 184 | .map_io = tegra_map_common_io, | 184 | .map_io = tegra_map_common_io, |
| 185 | .init_early = tegra_init_early, | 185 | .init_early = tegra_init_early, |