diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:58:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 00:11:41 +0100 |
| commit | a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf (patch) | |
| tree | 64a1035b02cb8aae34b96fc7c1c7caaad337ac07 /arch/arm/mach-tegra/board-trimslice.c | |
| parent | Merge branch 'depends/rmk/gpio' into next/board (diff) | |
| parent | ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_O... (diff) | |
| download | linux-a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf.tar.xz linux-a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf.zip | |
Merge branch 'depends/rmk/devel-stable' into next/board
The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/include/mach/entry-macro.S
arch/arm/mach-exynos4/mach-smdkc210.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-exynos4/mct.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra/board-trimslice.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index c3aff9fdffd3..990889443c15 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -171,7 +171,7 @@ static void __init tegra_trimslice_init(void) } MACHINE_START(TRIMSLICE, "trimslice") - .boot_params = 0x00000100, + .atag_offset = 0x100, .fixup = tegra_trimslice_fixup, .map_io = tegra_map_common_io, .init_early = tegra_init_early, |