| commit | 5d4ef26cd8a1d4dc0069a77c4582a3b1be529085 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@quicinc.com> | Tue May 09 11:17:21 2017 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue May 09 11:17:21 2017 -0700 |
| tree | 1e2251f8f756b0dbe35e82cf19ccc5d3cbc2b6d4 | |
| parent | 5da6eb2680fd42c46d25e2c88d501089af9fa7a0 [diff] | |
| parent | 4aecff93b0e7f8270af2786d039b08bd6d9ac6b1 [diff] |
Merge "defconfig: sdxpoorwills: enable REGULATOR_FIXED_VOLTAGE" into msm-4.9
diff --git a/arch/arm/configs/sdxpoorwills-perf_defconfig b/arch/arm/configs/sdxpoorwills-perf_defconfig index 1f6d2cc..bcef117 100644 --- a/arch/arm/configs/sdxpoorwills-perf_defconfig +++ b/arch/arm/configs/sdxpoorwills-perf_defconfig
@@ -208,6 +208,7 @@ CONFIG_POWER_SUPPLY=y CONFIG_THERMAL=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y
diff --git a/arch/arm/configs/sdxpoorwills_defconfig b/arch/arm/configs/sdxpoorwills_defconfig index 5d61163..5601276 100644 --- a/arch/arm/configs/sdxpoorwills_defconfig +++ b/arch/arm/configs/sdxpoorwills_defconfig
@@ -199,6 +199,7 @@ CONFIG_MSM_CDC_PINCTRL=y CONFIG_MSM_CDC_SUPPLY=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_FB=y CONFIG_SOUND=y CONFIG_SND=y