Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index a9a1af4..3ed3ff0 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -60,15 +60,6 @@ config MFD_ASIC3
          This driver supports the ASIC3 multifunction chip found on many
          PDAs (mainly iPAQ and HTC based ones)
 
          This driver supports the ASIC3 multifunction chip found on many
          PDAs (mainly iPAQ and HTC based ones)
 

-config MFD_SH_MOBILE_SDHI
-       bool "Support for SuperH Mobile SDHI"
-       depends on SUPERH || ARCH_SHMOBILE
-       select MFD_CORE
-       select TMIO_MMC_DMA
-        ---help---
-         This driver supports the SDHI hardware block found in many
-         SuperH Mobile SoCs.
-

 config MFD_DAVINCI_VOICECODEC
        tristate
        select MFD_CORE
 config MFD_DAVINCI_VOICECODEC
        tristate
        select MFD_CORE


@@ -133,6 +124,7 @@ config TPS6105X
        tristate "TPS61050/61052 Boost Converters"
        depends on I2C
        select REGULATOR
        tristate "TPS61050/61052 Boost Converters"
        depends on I2C
        select REGULATOR

+       select MFD_CORE

        select REGULATOR_FIXED_VOLTAGE
        help
          This option enables a driver for the TP61050/TPS61052
        select REGULATOR_FIXED_VOLTAGE
        help
          This option enables a driver for the TP61050/TPS61052


@@ -209,7 +201,7 @@ config TWL4030_POWER
          as clock request handshaking.
 
          This driver uses board-specific data to initialize the resources
          as clock request handshaking.
 
          This driver uses board-specific data to initialize the resources

-         and load scripts controling which resources are switched off/on
+         and load scripts controlling which resources are switched off/on

          or reset when a sleep, wakeup or warm reset event occurs.
 
 config TWL4030_CODEC
          or reset when a sleep, wakeup or warm reset event occurs.
 
 config TWL4030_CODEC


@@ -265,11 +257,6 @@ config MFD_TMIO
        bool
        default n
 
        bool
        default n
 

-config TMIO_MMC_DMA
-       bool
-       select DMA_ENGINE
-       select DMADEVICES
-

 config MFD_T7L66XB
        bool "Support Toshiba T7L66XB"
        depends on ARM && HAVE_CLK
 config MFD_T7L66XB
        bool "Support Toshiba T7L66XB"
        depends on ARM && HAVE_CLK


@@ -591,7 +578,7 @@ config AB3550_CORE
 config MFD_CS5535
        tristate "Support for CS5535 and CS5536 southbridge core functions"
        select MFD_CORE
 config MFD_CS5535
        tristate "Support for CS5535 and CS5536 southbridge core functions"
        select MFD_CORE

-       depends on PCI
+       depends on PCI && X86

        ---help---
          This is the core driver for CS5535/CS5536 MFD functions.  This is
           necessary for using the board's GPIO and MFGPT functionality.
        ---help---
          This is the core driver for CS5535/CS5536 MFD functions.  This is
           necessary for using the board's GPIO and MFGPT functionality.