commit 20cba1f65bdbfca645d1ab508b5d185d19eb2421
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 04 12:15:57 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 04 12:15:57 2017 -0700
tree ce690255629b0e20d0c6e33a33955501491c275b
parent e6fa66d0208776f85dd60d4c9ecb521c4ae10234
parent e3a1dc7e794f8b5c793a7b05761a4a9e7c85d7ea

Merge "ASoC: msm: qdsp6v2: Support app type for NOIRQ" into msm-4.9

arch/arm64/configs/sdm845-perf_defconfig

diff --git a/arch/arm64/configs/sdm845-perf_defconfig b/arch/arm64/configs/sdm845-perf_defconfig
index 395ae3f..e3d1a1f 100644
--- a/arch/arm64/configs/sdm845-perf_defconfig
+++ b/arch/arm64/configs/sdm845-perf_defconfig
@@ -404,6 +404,7 @@
 CONFIG_CLOCK_QPNP_DIV=y
 CONFIG_MSM_CLK_RPMH=y
 CONFIG_CLOCK_CPU_OSM=y
+CONFIG_MSM_GPUCC_SDM845=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_ARM_SMMU=y

arch/arm64/configs/sdm845_defconfig

diff --git a/arch/arm64/configs/sdm845_defconfig b/arch/arm64/configs/sdm845_defconfig
index 1a86941..dad8844 100644
--- a/arch/arm64/configs/sdm845_defconfig
+++ b/arch/arm64/configs/sdm845_defconfig
@@ -424,6 +424,7 @@
 CONFIG_CLOCK_QPNP_DIV=y
 CONFIG_MSM_CLK_RPMH=y
 CONFIG_CLOCK_CPU_OSM=y
+CONFIG_MSM_GPUCC_SDM845=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_ARM_SMMU=y