From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jan 2011 21:13:07 +0000 (-0800)
Subject: Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~21022
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ec08bdb148767f1193f5f3028749ed865ac27181;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.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: (27 commits)
  omap4: Fix ULPI PHY init for ES1.0 SDP
  omap3: beaglexm: fix power on of DVI
  omap3: igep3: Add omap_reserve functionality
  omap3: beaglexm: fix DVI reset GPIO
  omap3: beaglexm: fix EHCI power up GPIO dir
  omap3: igep2: Add keypad support
  omap3: igep3: Fix IGEP module second MMC channel power supply
  omap3: igep3: Add USB EHCI support for IGEP module
  omap3: clocks: Fix build error 'CK_3430ES2' undeclared here
  arm: omap4: pandaboard: turn on PHY reference clock at init
  omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
  omap2plus: voltage: Trivial linking fix for 'EINVAL' undeclared
  omap2plus: voltage: Trivial linking fix 'undefined reference'
  omap2plus: voltage: Trivial warning fix 'no return statement'
  omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
  arm: omap: gpio: don't access irq_desc array directly
  omap2+: pm_bus: make functions used as pointers as static
  OMAP: GPIO: fix _set_gpio_triggering() for OMAP2+
  OMAP2+: TWL: include pm header for init protos
  OMAP2+: TWL: make conversion routines static
  ...

Fix up conflicts in arch/arm/mach-omap2/board-omap3beagle.c ("DVI reset
GPIO" vs "use generic DPI panel driver")
---

ec08bdb148767f1193f5f3028749ed865ac27181
diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index a4fe8e1ee1bd,2ed804073f35..46d814ab5656
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -204,10 -197,11 +204,10 @@@ static struct panel_generic_dpi_data dv
  static struct omap_dss_device beagle_dvi_device = {
  	.type = OMAP_DISPLAY_TYPE_DPI,
  	.name = "dvi",
 -	.driver_name = "generic_panel",
 +	.driver_name = "generic_dpi_panel",
 +	.data = &dvi_panel,
  	.phy.dpi.data_lines = 24,
- 	.reset_gpio = 170,
+ 	.reset_gpio = -EINVAL,
 -	.platform_enable = beagle_enable_dvi,
 -	.platform_disable = beagle_disable_dvi,
  };
  
  static struct omap_dss_device beagle_tv_device = {