Skip to contentSkip to conversation

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

PATCH In review Koen Kooi 2 participants 2 messages May 15, 2008 – May 16, 2008

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Koen Kooi

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/arm/mach-omap2/board-omap3beagle.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-omap3beagle.c +1 -2
index 0c15ca0..0c0cbfc 100644
@@ -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();
 }
Signature · 1 line
1.5.4.3
maintainer
#1 lore raw
Quoted 1 line · Koen Kooi

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

Heh, this should teach you to not trust me to merge patches manually! :)

Pushing today.

Tony

Quoted 33 lines
Signed-off-by Koen Kooi <[email protected]>
---
 arch/arm/mach-omap2/board-omap3beagle.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-omap3beagle.c +1 -2
index 0c15ca0..0c0cbfc 100644
@@ -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();
 }
Signature · 6 lines
1.5.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html