From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 May 2008 07:34:43 +0000 (+0200)
Subject: ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
X-Git-Tag: v2.6.26-omap1~123^2~95
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=52f241c6ef362abcf454c1d1ef5fd6225533038f;p=linux-2.6-omap-h63xx.git

ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code

This patch fixes the merge-damage in the beagleboard RTC code

Signed-off-by: Koen Kooi <koen@openembedded.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 0c15ca01255..0c0cbfc6cd0 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -76,6 +76,7 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
 
 static void __init omap3_beagle_init(void)
 {
+	platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
 	omap_board_config = omap3_beagle_config;
 	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
 	omap_serial_init();
@@ -88,8 +89,6 @@ arch_initcall(omap3_beagle_i2c_init);
 
 static void __init omap3_beagle_map_io(void)
 {
-	platform_add_devices(omap3_beagle_devices,
-				ARRAY_SIZE(omap3_beagle_devices));
 	omap2_set_globals_343x();
 	omap2_map_common_io();
 }