Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

* 'for-next' of git://git.o-hand.com/linux-mfd: (30 commits)
  mfd: Fix section mismatch in da903x
  mfd: move drivers/i2c/chips/menelaus.c to drivers/mfd
  mfd: move drivers/i2c/chips/tps65010.c to drivers/mfd
  mfd: dm355evm msp430 driver
  mfd: Add missing break from wm3850-core
  mfd: Add WM8351 support
  mfd: Support configurable numbers of DCDCs and ISINKs on WM8350
  mfd: Handle missing WM8350 platform data
  mfd: Add WM8352 support
  mfd: Use irq_to_desc in twl4030 code
  power_supply: Add Dialog DA9030 battery charger driver
  mfd: Dialog DA9030 battery charger MFD driver
  mfd: Register WM8400 codec device
  mfd: Pass driver_data onto child devices
  mfd: Fix twl4030-core.c build error
  mfd: twl4030 regulator bug fixes
  mfd: twl4030: create some regulator devices
  mfd: twl4030: cleanup symbols and OMAP dependency
  mfd: twl4030: simplified child creation code
  power_supply: Add battery health reporting for WM8350
  ...

1 files changed, 0 insertions, 23 deletions

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 4c35702830ce..864ac561fdbb 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -126,19 +126,6 @@ config ISP1301_OMAP
           This driver can also be built as a module.  If so, the module
           will be called isp1301_omap.
 
-config TPS65010
-        tristate "TPS6501x Power Management chips"
-        depends on GPIOLIB
-        default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
-        help
-          If you say yes here you get support for the TPS6501x series of
-          Power Management chips.  These include voltage regulators,
-          lithium ion/polymer battery charging, and other features that
-          are often used in portable devices like cell phones and cameras.
-
-          This driver can also be built as a module.  If so, the module
-          will be called tps65010.
-
 config SENSORS_MAX6875
         tristate "Maxim MAX6875 Power supply supervisor"
         depends on EXPERIMENTAL
@@ -164,16 +151,6 @@ config SENSORS_TSL2550
           This driver can also be built as a module.  If so, the module
           will be called tsl2550.
 
-config MENELAUS
-        bool "TWL92330/Menelaus PM chip"
-        depends on I2C=y && ARCH_OMAP24XX
-        help
-          If you say yes here you get support for the Texas Instruments
-          TWL92330/Menelaus Power Management chip. This include voltage
-          regulators, Dual slot memory card tranceivers, real-time clock
-          and other features that are often used in portable devices like
-          cell phones and PDAs.
-
 config MCU_MPC8349EMITX
         tristate "MPC8349E-mITX MCU driver"
         depends on I2C && PPC_83xx