From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Mar 2011 03:03:12 +0000 (-0700)
Subject: Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0~1145
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17c6dd8144924e3c71930636091704da6d043536;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'omap-fixes-for-linus' of git://git./linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  hwspinlock: depend on OMAP4
  ARM: OMAP2+: Fix warnings for GPMC interrupt
  OMAP4: PandaBoard: remove unused power regulators
  arm: mach-omap2: omap_l3_smx: fix irq handler setup
  arm: mach-omap2: devices: fix omap3_l3_init() return value
---

17c6dd8144924e3c71930636091704da6d043536
diff --cc arch/arm/mach-omap2/board-omap4panda.c
index c936c6d7,80b8860..f3a7b10
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -429,10 -391,8 +402,9 @@@ static struct twl4030_platform_data oma
  	.vcxio		= &omap4_panda_vcxio,
  	.vdac		= &omap4_panda_vdac,
  	.vusb		= &omap4_panda_vusb,
- 	.vaux1		= &omap4_panda_vaux1,
  	.vaux2		= &omap4_panda_vaux2,
  	.vaux3		= &omap4_panda_vaux3,
 +	.clk32kg	= &omap4_panda_clk32kg,
  	.usb		= &omap4_usbphy_data,
  };