5 files changed, 16 insertions, 15 deletions

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 4c35702830ce..fa69c992c442 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
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 23d2a31b0a64..0c7e2f1e0c4b 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
 obj-$(CONFIG_PCF8575)           += pcf8575.o
 obj-$(CONFIG_SENSORS_PCF8591)   += pcf8591.o
 obj-$(CONFIG_ISP1301_OMAP)      += isp1301_omap.o
-obj-$(CONFIG_TPS65010)          += tps65010.o
 obj-$(CONFIG_MENELAUS)          += menelaus.o
 obj-$(CONFIG_SENSORS_TSL2550)   += tsl2550.o
 obj-$(CONFIG_MCU_MPC8349EMITX)  += mcu_mpc8349emitx.o
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 02e9146ca44a..182e1486e9d1 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -69,6 +69,19 @@ config UCB1400_CORE
           To compile this driver as a module, choose M here: the
           module will be called ucb1400_core.
 
+config TPS65010
+        tristate "TPS6501x Power Management chips"
+        depends on I2C && 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 TWL4030_CORE
         bool "Texas Instruments TWL4030/TPS659x0 Support"
         depends on I2C=y && GENERIC_HARDIRQS
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 8f6cd5c48930..3989e30e954e 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -19,6 +19,8 @@ wm8350-objs			:= wm8350-core.o wm8350-regmap.o wm8350-gpio.o
 obj-$(CONFIG_MFD_WM8350)        += wm8350.o
 obj-$(CONFIG_MFD_WM8350_I2C)    += wm8350-i2c.o
 
+obj-$(CONFIG_TPS65010)          += tps65010.o
+
 obj-$(CONFIG_TWL4030_CORE)      += twl4030-core.o twl4030-irq.o
 
 obj-$(CONFIG_MFD_CORE)          += mfd-core.o
@@ -33,4 +35,4 @@ obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-assabet.o
 endif
 obj-$(CONFIG_UCB1400_CORE)      += ucb1400_core.o
 
-obj-$(CONFIG_PMIC_DA903X)       += da903x.o
\ No newline at end of file
+obj-$(CONFIG_PMIC_DA903X)       += da903x.o
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/mfd/tps65010.c
index acf8b9d5f575..acf8b9d5f575 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/mfd/tps65010.c