summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2014-06-04 23:37:32 +0200
committerNicolas Chauvet <kwizart@gmail.com>2014-07-07 16:20:07 +0200
commitbb94e837aae36b6a0dc73a9a53de6d4dcbe5a6ee (patch)
treed180737e8545fe9ee88cfd4febb499779ca09f19 /config-armv7-generic
parent93e94ca67374231e4bcf31844a7a62a033a8528c (diff)
downloadkernel-bb94e837aae36b6a0dc73a9a53de6d4dcbe5a6ee.tar.gz
kernel-bb94e837aae36b6a0dc73a9a53de6d4dcbe5a6ee.tar.xz
kernel-bb94e837aae36b6a0dc73a9a53de6d4dcbe5a6ee.zip
Add TPS6586x RTC/Regulator as builtin
Conflicts: config-armv7
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index be7822bd..ff755716 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -628,7 +628,7 @@ CONFIG_REGULATOR_TPS6507X=m
CONFIG_REGULATOR_TPS65090=m
CONFIG_REGULATOR_TPS65217=m
CONFIG_REGULATOR_TPS6524X=m
-CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS6586X=y
CONFIG_REGULATOR_TPS65910=m
CONFIG_REGULATOR_TPS65912=m
CONFIG_REGULATOR_TPS80031=m