Pandora Sourcecodes - openembedded.git/blob

   1 From eddf57fb9748791e021ef550d651cc72c48add5c Mon Sep 17 00:00:00 2001
   2 From: Koen Kooi <koen@openembedded.org>
   3 Date: Thu, 15 May 2008 09:32:23 +0200
   4 Subject: [PATCH] ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
   5
   6 This patch fixes the merge-damage in the beagleboard RTC code
   7
   8 Signed-off-by: Koen Kooi <koen@openembedded.org>
   9 ---
  10  arch/arm/mach-omap2/board-omap3beagle.c |    3 +--
  11  1 files changed, 1 insertions(+), 2 deletions(-)
  12
  13 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
  14 index 0c15ca0..0c0cbfc 100644
  15 --- a/arch/arm/mach-omap2/board-omap3beagle.c
  16 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
  17 @@ -76,6 +76,7 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
  18
  19  static void __init omap3_beagle_init(void)
  20  {
  21 +       platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
  22         omap_board_config = omap3_beagle_config;
  23         omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
  24         omap_serial_init();
  25 @@ -88,8 +89,6 @@ arch_initcall(omap3_beagle_i2c_init);
  26
  27  static void __init omap3_beagle_map_io(void)
  28  {
  29 -       platform_add_devices(omap3_beagle_devices,
  30 -                               ARRAY_SIZE(omap3_beagle_devices));
  31         omap2_set_globals_343x();
  32         omap2_map_common_io();
  33  }
  34 --
  35 1.5.4.3
  36