diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index b57ec09af891698dd1dc990c77cc4dfc9a2eed24..d213646037553cabba73180bc4beb1b6d6d68440 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -424,4 +424,11 @@ config AB8500_GPIO
 	depends on AB8500_CORE && BROKEN
 	help
 	  Select this to enable the AB8500 IC GPIO driver
+
+config GPIO_TPS65910
+	bool "TPS65910 GPIO"
+	depends on MFD_TPS65910
+	help
+	  Select this option to enable GPIO driver for the TPS65910
+	  chip family.
 endif
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index d92ce3a62ae593aedbaee5681ad3acc4485a8e4d..6a3387acc0e5d71b8daae00da808f271bca6ed3f 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -40,3 +40,4 @@ obj-$(CONFIG_GPIO_SX150X)	+= sx150x.o
 obj-$(CONFIG_GPIO_VX855)	+= vx855_gpio.o
 obj-$(CONFIG_GPIO_ML_IOH)	+= ml_ioh_gpio.o
 obj-$(CONFIG_AB8500_GPIO)       += ab8500-gpio.o
+obj-$(CONFIG_GPIO_TPS65910)	+= tps65910-gpio.o
diff --git a/drivers/mfd/tps65910-gpio.c b/drivers/gpio/tps65910-gpio.c
similarity index 100%
rename from drivers/mfd/tps65910-gpio.c
rename to drivers/gpio/tps65910-gpio.c
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 4990a492a09b3c2e6c0cadbc4b78913970c9c75b..b6c267724e14b1dabb9b08b6daac2821351f5817 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -721,8 +721,9 @@ config MFD_PM8XXX_IRQ
 
 config MFD_TPS65910
 	bool "TPS65910 Power Management chip"
-	depends on I2C=y && GPIOLIB
+	depends on I2C=y
 	select MFD_CORE
+	select GPIO_TPS65910
 	help
 	  if you say yes here you get support for the TPS65910 series of
 	  Power Management chips.
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index bdb8eab5668b4b7e993b1a465632f633989d75a4..efe3cc33ed92ed83a7a8ece78f32686c87bb6170 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -93,4 +93,4 @@ obj-$(CONFIG_MFD_CS5535)	+= cs5535-mfd.o
 obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o
 obj-$(CONFIG_MFD_PM8921_CORE) 	+= pm8921-core.o
 obj-$(CONFIG_MFD_PM8XXX_IRQ) 	+= pm8xxx-irq.o
-obj-$(CONFIG_MFD_TPS65910)	+= tps65910.o tps65910-gpio.o tps65910-irq.o
+obj-$(CONFIG_MFD_TPS65910)	+= tps65910.o tps65910-irq.o