aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2011-07-04 11:34:16 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-07-31 17:28:25 -0400
commit54f323b1325499574d92c85201971df096c25b79 (patch)
treeb8e8ee84f2c8c858d322cbe2fdd2f17f4c8b1ecc /drivers/mfd
parent4dcaa6b6df354fa44b3072bed3cb13aad7e5fbd4 (diff)
mfd: Move TPS55910 Kconfig option
Having another TPS chip at the end of the Kconfig when all it's relatives are grouped together in their own section seems totally counter-intuitive. Move it, also in the Makefile. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/Kconfig18
-rw-r--r--drivers/mfd/Makefile2
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 3695a078bae7..c26136443c05 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -171,6 +171,15 @@ config MFD_TPS6586X
171 This driver can also be built as a module. If so, the module 171 This driver can also be built as a module. If so, the module
172 will be called tps6586x. 172 will be called tps6586x.
173 173
174config MFD_TPS65910
175 bool "TPS65910 Power Management chip"
176 depends on I2C=y && GPIOLIB
177 select MFD_CORE
178 select GPIO_TPS65910
179 help
180 if you say yes here you get support for the TPS65910 series of
181 Power Management chips.
182
174config MFD_TPS65912 183config MFD_TPS65912
175 bool 184 bool
176 depends on GPIOLIB 185 depends on GPIOLIB
@@ -748,15 +757,6 @@ config MFD_PM8XXX_IRQ
748 This is required to use certain other PM 8xxx features, such as GPIO 757 This is required to use certain other PM 8xxx features, such as GPIO
749 and MPP. 758 and MPP.
750 759
751config MFD_TPS65910
752 bool "TPS65910 Power Management chip"
753 depends on I2C=y && GPIOLIB
754 select MFD_CORE
755 select GPIO_TPS65910
756 help
757 if you say yes here you get support for the TPS65910 series of
758 Power Management chips.
759
760config TPS65911_COMPARATOR 760config TPS65911_COMPARATOR
761 tristate 761 tristate
762 762
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 1d593b9085b7..ca1867db3db8 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_MFD_WM8994) += wm8994-core.o wm8994-irq.o
36obj-$(CONFIG_TPS6105X) += tps6105x.o 36obj-$(CONFIG_TPS6105X) += tps6105x.o
37obj-$(CONFIG_TPS65010) += tps65010.o 37obj-$(CONFIG_TPS65010) += tps65010.o
38obj-$(CONFIG_TPS6507X) += tps6507x.o 38obj-$(CONFIG_TPS6507X) += tps6507x.o
39obj-$(CONFIG_MFD_TPS65910) += tps65910.o tps65910-irq.o
39tps65912-objs := tps65912-core.o tps65912-irq.o 40tps65912-objs := tps65912-core.o tps65912-irq.o
40obj-$(CONFIG_MFD_TPS65912) += tps65912.o 41obj-$(CONFIG_MFD_TPS65912) += tps65912.o
41obj-$(CONFIG_MFD_TPS65912_I2C) += tps65912-i2c.o 42obj-$(CONFIG_MFD_TPS65912_I2C) += tps65912-i2c.o
@@ -99,5 +100,4 @@ obj-$(CONFIG_MFD_CS5535) += cs5535-mfd.o
99obj-$(CONFIG_MFD_OMAP_USB_HOST) += omap-usb-host.o 100obj-$(CONFIG_MFD_OMAP_USB_HOST) += omap-usb-host.o
100obj-$(CONFIG_MFD_PM8921_CORE) += pm8921-core.o 101obj-$(CONFIG_MFD_PM8921_CORE) += pm8921-core.o
101obj-$(CONFIG_MFD_PM8XXX_IRQ) += pm8xxx-irq.o 102obj-$(CONFIG_MFD_PM8XXX_IRQ) += pm8xxx-irq.o
102obj-$(CONFIG_MFD_TPS65910) += tps65910.o tps65910-irq.o
103obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o 103obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o