]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
authorKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 07:34:43 +0000 (09:34 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 16 May 2008 15:31:30 +0000 (08:31 -0700)
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>
arch/arm/mach-omap2/board-omap3beagle.c

index 0c15ca012550ad134a33e6d5e4a69e0731abfe01..0c0cbfc6cd0a4642da5b0747f0aa77bb38ad594a 100644 (file)
@@ -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();
 }