From: Tony Lindgren <tony@atomide.com>
Date: Mon, 27 Sep 2010 17:19:44 +0000 (-0700)
Subject: Merge branch 'devel-boards' into omap-for-linus
X-Git-Tag: firefly_0821_release~7613^2~3644^2~50
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=98bb8c3e98267f2aa422bbafce3b734016e7ed02;p=firefly-linux-kernel-4.4.55.git

Merge branch 'devel-boards' into omap-for-linus
---

98bb8c3e98267f2aa422bbafce3b734016e7ed02
diff --cc arch/arm/mach-omap2/board-omap4panda.c
index 0bb2353b64a4,22a8fd30f9ff..aa8296e7e9d4
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -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 */