diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:58:06 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:11:41 -0400 |
| commit | a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf (patch) | |
| tree | 64a1035b02cb8aae34b96fc7c1c7caaad337ac07 /arch/arm/mach-omap2/board-omap3touchbook.c | |
| parent | 335332770c68649ffeaf5dc2b58d9cd40041e295 (diff) | |
| parent | 531a6a941745e1e045dd2a6bd09e1dc01247a5f3 (diff) | |
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-omap2/board-omap3touchbook.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 852ea0464057..49e4bd207cb6 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
| @@ -404,7 +404,7 @@ static void __init omap3_touchbook_init(void) | |||
| 404 | 404 | ||
| 405 | MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board") | 405 | MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board") |
| 406 | /* Maintainer: Gregoire Gentil - http://www.alwaysinnovating.com */ | 406 | /* Maintainer: Gregoire Gentil - http://www.alwaysinnovating.com */ |
| 407 | .boot_params = 0x80000100, | 407 | .atag_offset = 0x100, |
| 408 | .reserve = omap_reserve, | 408 | .reserve = omap_reserve, |
| 409 | .map_io = omap3_map_io, | 409 | .map_io = omap3_map_io, |
| 410 | .init_early = omap3_touchbook_init_early, | 410 | .init_early = omap3_touchbook_init_early, |