From mboxrd@z Thu Jan 1 00:00:00 1970 From: Koen Kooi Subject: [PATCH] ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code Date: Thu, 15 May 2008 09:34:43 +0200 Message-ID: <1210836883-7409-1-git-send-email-koen@openembedded.org> Return-path: Received: from smtp2.utsp.utwente.nl ([130.89.2.9]:55971 "EHLO smtp.utwente.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856AbYEOHfI (ORCPT ); Thu, 15 May 2008 03:35:08 -0400 Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-omap@vger.kernel.org Cc: Koen Kooi This patch fixes the merge-damage in the beagleboard RTC code Signed-off-by: Koen Kooi --- arch/arm/mach-omap2/board-omap3beagle.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 0c15ca0..0c0cbfc 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(); } -- 1.5.4.3