commit 15c26cdd1a47288dd74e226b42cc1da2d5896247
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 24 11:20:49 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 24 11:20:49 2017 -0700
tree c059abec251fab4c3dfe0c10c1507e50dea29e69
parent 1fa07c8bfa604b8a0bb14528a91070a4db501c2d
parent 7e35bf9c93d1b35c10ad54270885fa08e889f8c5

Merge "defconfig: Enable UIO_MSM_SHAREDMEM driver for sdm845" 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 e3369f2..852c01f 100644
--- a/arch/arm64/configs/sdm845-perf_defconfig
+++ b/arch/arm64/configs/sdm845-perf_defconfig
@@ -398,6 +398,7 @@
 CONFIG_RTC_DRV_QPNP=y
 CONFIG_DMADEVICES=y
 CONFIG_UIO=y
+CONFIG_UIO_MSM_SHAREDMEM=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y

arch/arm64/configs/sdm845_defconfig

diff --git a/arch/arm64/configs/sdm845_defconfig b/arch/arm64/configs/sdm845_defconfig
index daa0150..7720806 100644
--- a/arch/arm64/configs/sdm845_defconfig
+++ b/arch/arm64/configs/sdm845_defconfig
@@ -415,6 +415,7 @@
 CONFIG_RTC_DRV_QPNP=y
 CONFIG_DMADEVICES=y
 CONFIG_UIO=y
+CONFIG_UIO_MSM_SHAREDMEM=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y