diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-19 00:27:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-19 00:27:06 -0700 |
| commit | d4041b86d5e341c82a4e5b0cd09f4edc7ecb068a (patch) | |
| tree | 428a85982b7f2514a8d2de408fefbd296e9011e4 | |
| parent | edac345d023f8a48f720553ac9f9aeb83101df6f (diff) | |
| parent | 8312036ea6ba7141ac5c6e8cbde469e178dd376e (diff) | |
Merge "defconfig: msm: Enable maxim regulator driver for msm8996-auto"
| -rw-r--r-- | arch/arm64/configs/msm-auto-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/msm-auto_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/msm-auto-perf_defconfig b/arch/arm64/configs/msm-auto-perf_defconfig index d2a0fc53235d..dbb75e313510 100644 --- a/arch/arm64/configs/msm-auto-perf_defconfig +++ b/arch/arm64/configs/msm-auto-perf_defconfig @@ -344,6 +344,7 @@ CONFIG_WCD9335_CODEC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FAN53555=y +CONFIG_REGULATOR_MAX20010=y CONFIG_REGULATOR_ONSEMI_NCP6335D=y CONFIG_REGULATOR_RPM_SMD=y CONFIG_REGULATOR_QPNP=y diff --git a/arch/arm64/configs/msm-auto_defconfig b/arch/arm64/configs/msm-auto_defconfig index e67df6338136..553677803e42 100644 --- a/arch/arm64/configs/msm-auto_defconfig +++ b/arch/arm64/configs/msm-auto_defconfig @@ -347,6 +347,7 @@ CONFIG_WCD9335_CODEC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FAN53555=y +CONFIG_REGULATOR_MAX20010=y CONFIG_REGULATOR_ONSEMI_NCP6335D=y CONFIG_REGULATOR_RPM_SMD=y CONFIG_REGULATOR_QPNP=y |