mfd: Rename 88pm8607 to 88pm860x in mfd

[~andy/linux] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 413576a2f313347c745f85ded7e3820a1ad55813..815907eb70a47dbc70c7f51a55146c99fe1d22a8 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -9,6 +9,16 @@ config MFD_CORE
        tristate
        default n
 
+config MFD_88PM860X
+       bool "Support Marvell 88PM8606/88PM8607"
+       depends on I2C=y
+       select MFD_CORE
+       help
+         This supports for Marvell 88PM8606/88PM8607 Power Management IC.
+         This includes the I2C driver and the core APIs _only_, you have to
+         select individual components like voltage regulators, RTC and
+         battery-charger under the corresponding menus.
+
 config MFD_SM501
        tristate "Support for Silicon Motion SM501"
         ---help---
@@ -94,7 +104,7 @@ config TPS65010
 
 config MENELAUS
        bool "Texas Instruments TWL92330/Menelaus PM chip"
-       depends on I2C=y && ARCH_OMAP24XX
+       depends on I2C=y && ARCH_OMAP2
        help
          If you say yes here you get support for the Texas Instruments
          TWL92330/Menelaus Power Management chip. This include voltage
@@ -205,7 +215,7 @@ config MFD_WM831X
          functionality of the device.
 
 config MFD_WM8350
-       tristate
+       bool
 
 config MFD_WM8350_CONFIG_MODE_0
        bool
@@ -256,9 +266,9 @@ config MFD_WM8352_CONFIG_MODE_3
        depends on MFD_WM8350
 
 config MFD_WM8350_I2C
-       tristate "Support Wolfson Microelectronics WM8350 with I2C"
+       bool "Support Wolfson Microelectronics WM8350 with I2C"
        select MFD_WM8350
-       depends on I2C
+       depends on I2C=y
        help
          The WM8350 is an integrated audio and power management
          subsystem with watchdog and RTC functionality for embedded
@@ -329,16 +339,6 @@ config EZX_PCAP
          This enables the PCAP ASIC present on EZX Phones. This is
          needed for MMC, TouchScreen, Sound, USB, etc..
 
-config MFD_88PM8607
-       bool "Support Marvell 88PM8607"
-       depends on I2C=y
-       select MFD_CORE
-       help
-         This supports for Marvell 88PM8607 Power Management IC. This includes
-         the I2C driver and the core APIs _only_, you have to select
-         individual components like voltage regulators, RTC and
-         battery-charger under the corresponding menus.
-
 config AB4500_CORE
        tristate "ST-Ericsson's AB4500 Mixed Signal Power management chip"
        depends on SPI