| commit | d616a98b6833184303e91c264ef9f0ee85459314 | [log] [tgz] |
|---|---|---|
| author | Kyle Yan <kyan@quicinc.com> | Mon Dec 19 10:34:51 2016 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Dec 19 10:34:51 2016 -0800 |
| tree | ff117d95f8c659b509064a7251d14c6722b1e9ab | |
| parent | 8ef9d075818ba44710e0600b45a04dae54b03834 [diff] | |
| parent | a0bc00b81545371ebbd6232d61f7d74b6be503d4 [diff] |
Merge "arm64: defconfig: Enable Command DB" into msm-4.8
diff --git a/arch/arm64/configs/msmskunk-perf_defconfig b/arch/arm64/configs/msmskunk-perf_defconfig index b6de910..eeeef35 100644 --- a/arch/arm64/configs/msmskunk-perf_defconfig +++ b/arch/arm64/configs/msmskunk-perf_defconfig
@@ -341,6 +341,7 @@ CONFIG_MSM_PIL=y CONFIG_MSM_PIL_SSR_GENERIC=y CONFIG_MSM_PIL_MSS_QDSP6V5=y +CONFIG_QCOM_COMMAND_DB=y CONFIG_EXTCON=y CONFIG_IIO=y CONFIG_PWM=y
diff --git a/arch/arm64/configs/msmskunk_defconfig b/arch/arm64/configs/msmskunk_defconfig index 9d21a80..c905c2d 100644 --- a/arch/arm64/configs/msmskunk_defconfig +++ b/arch/arm64/configs/msmskunk_defconfig
@@ -352,6 +352,7 @@ CONFIG_MSM_PIL=y CONFIG_MSM_PIL_SSR_GENERIC=y CONFIG_MSM_PIL_MSS_QDSP6V5=y +CONFIG_QCOM_COMMAND_DB=y CONFIG_EXTCON=y CONFIG_IIO=y CONFIG_PWM=y