Merge branch 'devel-boards' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 17:19:44 +0000 (10:19 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 17:19:44 +0000 (10:19 -0700)
1  2 
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap4panda.c

Simple merge
index 0bb2353b64a4bf138d59608bdad9b111b336087b,22a8fd30f9ffddec29afa1727ef7987c721260a0..aa8296e7e9d45b078b0191d39565a79859cdde27
@@@ -274,7 -305,10 +305,8 @@@ static int __init omap4_panda_i2c_init(
  }
  static void __init omap4_panda_init(void)
  {
 -      int status;
 -
        omap4_panda_i2c_init();
+       platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices));
        omap_serial_init();
        omap4_twl6030_hsmmc_init(mmc);
        /* OMAP4 Panda uses internal transceiver so register nop transceiver */