Merge branch 'pxa-tosa' into pxa

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/tosa.c
	arch/arm/mach-pxa/spitz.c

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index ae96bd6242f2..0f6a885a6c19 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -5,6 +5,10 @@
 menu "Multifunction device drivers"
         depends on HAS_IOMEM
 
+config MFD_CORE
+        tristate
+        default n
+
 config MFD_SM501
         tristate "Support for Silicon Motion SM501"
          ---help---
@@ -38,6 +42,13 @@ config HTC_PASIC3
           HTC Magician devices, respectively. Actual functionality is
           handled by the leds-pasic3 and ds1wm drivers.
 
+config MFD_TC6393XB
+        bool "Support Toshiba TC6393XB"
+        depends on HAVE_GPIO_LIB
+        select MFD_CORE
+        help
+          Support for Toshiba Mobile IO Controller TC6393XB
+
 endmenu
 
 menu "Multimedia Capabilities Port drivers"