Home Home > GIT Browse > SLE15-SP2-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-09-19 07:11:46 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-09-19 07:11:46 +0200
commit68b169308f84055c6633ac026740e78c54afc9e4 (patch)
treea1136bbf965446249bf7f653e63a02fe15d92362
parentfdcd619a68d3a9d9c5bf9325d5e7e7302d5d3293 (diff)
parent76ac02e35491f314b4c4d40cc5372cd12549c18a (diff)
Merge branch 'SLE15-SP2' into SLE15-SP2-AZURESLE15-SP2-AZURE
-rw-r--r--config/arm64/default2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 78f117eca7..ce0fcd48bf 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -7833,7 +7833,7 @@ CONFIG_ROCKCHIP_IOMMU=y
CONFIG_EXYNOS_IOMMU=y
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
CONFIG_ARM_SMMU=y
-CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set
CONFIG_ARM_SMMU_V3=y
CONFIG_MTK_IOMMU=y
CONFIG_QCOM_IOMMU=y