commit a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf
author Arnd Bergmann <arnd@arndb.de> Mon Oct 31 23:58:06 2011 +0100
committer Arnd Bergmann <arnd@arndb.de> Tue Nov 01 00:11:41 2011 +0100
tree 64a1035b02cb8aae34b96fc7c1c7caaad337ac07
parent 335332770c68649ffeaf5dc2b58d9cd40041e295
parent 531a6a941745e1e045dd2a6bd09e1dc01247a5f3

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>

arch/arm/mach-ep93xx/vision_ep9307.c

diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
index 10f6488..d96e4db 100644
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -356,7 +356,7 @@
 
 MACHINE_START(VISION_EP9307, "Vision Engraving Systems EP9307")
 	/* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */
-	.boot_params	= EP93XX_SDCE0_PHYS_BASE + 0x100,
+	.atag_offset	= 0x100,
 	.map_io		= vision_map_io,
 	.init_irq	= ep93xx_init_irq,
 	.timer		= &ep93xx_timer,