summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2014-08-26 22:22:49 +0200
committerNicolas Chauvet <kwizart@gmail.com>2014-09-06 13:33:00 +0200
commitd18cfb2641f0b4bc2a0e6c9f87fc8f73dd05b68b (patch)
treef41c256f23b88042b57cda10e22a93279d94bfa7
parentf88c6a2d75d70df4c13abfa0530690518fc4697a (diff)
downloadkernel-d18cfb2641f0b4bc2a0e6c9f87fc8f73dd05b68b.tar.gz
kernel-d18cfb2641f0b4bc2a0e6c9f87fc8f73dd05b68b.tar.xz
kernel-d18cfb2641f0b4bc2a0e6c9f87fc8f73dd05b68b.zip
Enable MFD_TPS80031=y in armv7-generic
-rw-r--r--config-armv71
-rw-r--r--config-armv7-generic2
2 files changed, 1 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7
index 489c3f82..e9d5a894 100644
--- a/config-armv7
+++ b/config-armv7
@@ -585,7 +585,6 @@ CONFIG_SND_SOC_TEGRA20_SPDIF=m
# AC100 (PAZ00)
CONFIG_MFD_NVEC=y
-CONFIG_MFD_TPS80031=y
CONFIG_KEYBOARD_NVEC=y
CONFIG_SERIO_NVEC_PS2=y
CONFIG_NVEC_POWER=y
diff --git a/config-armv7-generic b/config-armv7-generic
index d9630d16..5c161150 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -435,7 +435,7 @@ CONFIG_MFD_TPS65912_SPI=y
# CONFIG_MFD_88PM800 is not set
# CONFIG_MFD_88PM805 is not set
# CONFIG_MFD_PALMAS is not set
-# CONFIG_MFD_TPS80031 is not set
+CONFIG_MFD_TPS80031=y
# CONFIG_TWL4030_CORE is not set
# CONFIG_TWL6040_CORE is not set
#