From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 7 Oct 2008 18:07:22 +0000 (+0100)
Subject: Merge branch 'pxa-palm' into pxa-machines
X-Git-Tag: v2.6.28-rc1~293^2~6^2~17^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1543966a079fc7065849ae43ca4dd767c188ad55;p=linux-2.6-omap-h63xx.git

Merge branch 'pxa-palm' into pxa-machines

Conflicts:

	drivers/mfd/Kconfig
	drivers/pcmcia/Makefile
---

1543966a079fc7065849ae43ca4dd767c188ad55
diff --cc drivers/mfd/Kconfig
index 10c44d3fe01,371d22a98f1..5dba1651f9c
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@ -50,26 -50,15 +50,35 @@@ config HTC_PASIC
  	  HTC Magician devices, respectively. Actual functionality is
  	  handled by the leds-pasic3 and ds1wm drivers.
  
+ config UCB1400_CORE
+ 	tristate "Philips UCB1400 Core driver"
+ 	help
+ 	  This enables support for the Philips UCB1400 core functions.
+ 	  The UCB1400 is an AC97 audio codec.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called ucb1400_core.
+ 
 +config MFD_TMIO
 +	bool
 +	default n
 +
 +config MFD_T7L66XB
 +	bool "Support Toshiba T7L66XB"
 +	depends on ARM
 +	select MFD_CORE
 +	select MFD_TMIO
 +	help
 +	  Support for Toshiba Mobile IO Controller T7L66XB
 +
 +config MFD_TC6387XB
 +	bool "Support Toshiba TC6387XB"
 +	depends on ARM
 +	select MFD_CORE
 +	select MFD_TMIO
 +	help
 +	  Support for Toshiba Mobile IO Controller TC6387XB
 +
  config MFD_TC6393XB
  	bool "Support Toshiba TC6393XB"
  	depends on GPIOLIB && ARM
diff --cc drivers/pcmcia/Makefile
index 20c5b06790a,c6d89fd3dcf..679ca927a62
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@@ -71,7 -71,7 +71,8 @@@ sa1100_cs-$(CONFIG_SA1100_SIMPAD)		+= s
  pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK)		+= pxa2xx_lubbock.o sa1111_generic.o
  pxa2xx_cs-$(CONFIG_MACH_MAINSTONE)		+= pxa2xx_mainstone.o
  pxa2xx_cs-$(CONFIG_PXA_SHARPSL)			+= pxa2xx_sharpsl.o
 -pxa2xx_cs-$(CONFIG_MACH_ARMCORE)		+= pxa2xx_cm_x270.o
 +pxa2xx_cs-$(CONFIG_MACH_ARMCORE)		+= pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
 +pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA)		+= pxa2xx_trizeps.o
- pxa2xx_cs-$(CONFIG_MACH_PALMTX)		+= pxa2xx_palmtx.o
+ pxa2xx_cs-$(CONFIG_MACH_PALMTX)			+= pxa2xx_palmtx.o
+ pxa2xx_cs-$(CONFIG_MACH_PALMLD)			+= pxa2xx_palmld.o