From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Jun 2009 20:42:43 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2cf4d4514d5b43c1f3b64bd0ec8b9853bde8f1dc;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of /home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
  MAINTAINERS: EB110ATX is not ebsa110
  MAINTAINERS: update Eric Miao's email address and status
  fb: add support of LCD display controller on pxa168/910 (base layer)
  [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
  [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
  [ARM] 5544/1: Trust PrimeCell resource sizes
  [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
  [ARM] pxa/sharpsl_pm: drop set_irq_type calls
  [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
  [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
  [ARM] sa1100: remove unused collie_pm.c
  [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
  [ARM] 5550/1: Add default configure file for w90p910 platform
  [ARM] 5549/1: Add clock api for w90p910 platform.
  [ARM] 5548/1: Add gpio api for w90p910 platform
  [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
  [ARM] Make ARM_VIC_NR depend on ARM_VIC
  [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
  ARM: OMAP4: SMP: Update defconfig for OMAP4430
  ARM: OMAP4: SMP: Enable SMP support for OMAP4430
  ...
---

2cf4d4514d5b43c1f3b64bd0ec8b9853bde8f1dc
diff --cc arch/arm/plat-mxc/include/mach/imx-uart.h
index f9bd17dd8dd7,90af4d9bc19e..4adec9b154dd
--- a/arch/arm/plat-mxc/include/mach/imx-uart.h
+++ b/arch/arm/plat-mxc/include/mach/imx-uart.h
@@@ -24,12 -23,8 +24,12 @@@
  
  struct imxuart_platform_data {
  	int (*init)(struct platform_device *pdev);
- 	int (*exit)(struct platform_device *pdev);
+ 	void (*exit)(struct platform_device *pdev);
  	unsigned int flags;
 +	void (*irda_enable)(int enable);
 +	unsigned int irda_inv_rx:1;
 +	unsigned int irda_inv_tx:1;
 +	unsigned short transceiver_delay;
  };
  
  #endif
diff --cc sound/soc/pxa/Kconfig
index dcd163a4ee9a,96b2699abf61..6375b4ea525d
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@@ -95,11 -95,12 +95,12 @@@ config SND_PXA2XX_SOC_EM_X27
  	select SND_SOC_WM9712
  	help
  	  Say Y if you want to add support for SoC audio on
 -	  CompuLab EM-x270.
 +	  CompuLab EM-x270, eXeda and CM-X300 machines.
  
  config SND_PXA2XX_SOC_PALM27X
- 	bool "SoC Audio support for Palm T|X, T5 and LifeDrive"
- 	depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || MACH_PALMT5)
+ 	bool "SoC Audio support for Palm T|X, T5, E2 and LifeDrive"
+ 	depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \
+ 			MACH_PALMT5 || MACH_PALMTE2)
  	select SND_PXA2XX_SOC_AC97
  	select SND_SOC_WM9712
  	help