commit 13bd7d2d0a2aaecb2ba618ff057358b8fc48721b
author Linux Build Service Account <lnxbuild@localhost> Thu Feb 02 22:57:48 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Feb 02 22:57:48 2017 -0800
tree 5f633ff15e16089f32a753be6a8f30d2a3691ddd
parent cf472a9429e30f3f0388d6223da3e857eefb4f71
parent aae74de5e7b917aa94e3922f93330f3d063fcb51

Merge "defconfig: arm64: msmskunk: Enable SPS driver" into msm-4.8

arch/arm64/configs/msmskunk-perf_defconfig

diff --git a/arch/arm64/configs/msmskunk-perf_defconfig b/arch/arm64/configs/msmskunk-perf_defconfig
index 943f57d..cf9adb7 100644
--- a/arch/arm64/configs/msmskunk-perf_defconfig
+++ b/arch/arm64/configs/msmskunk-perf_defconfig
@@ -326,6 +326,8 @@
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ION=y
 CONFIG_ION_MSM=y
+CONFIG_SPS=y
+CONFIG_SPS_SUPPORT_NDP_BAM=y
 CONFIG_MSM_GCC_SKUNK=y
 CONFIG_MSM_VIDEOCC_SKUNK=y
 CONFIG_REMOTE_SPINLOCK_MSM=y

arch/arm64/configs/msmskunk_defconfig

diff --git a/arch/arm64/configs/msmskunk_defconfig b/arch/arm64/configs/msmskunk_defconfig
index 5b5ee60..c2a3c6b 100644
--- a/arch/arm64/configs/msmskunk_defconfig
+++ b/arch/arm64/configs/msmskunk_defconfig
@@ -337,6 +337,8 @@
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ION=y
 CONFIG_ION_MSM=y
+CONFIG_SPS=y
+CONFIG_SPS_SUPPORT_NDP_BAM=y
 CONFIG_MSM_GCC_SKUNK=y
 CONFIG_MSM_VIDEOCC_SKUNK=y
 CONFIG_REMOTE_SPINLOCK_MSM=y