Home Home > GIT Browse > openSUSE-15.2
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-09-19 00:22:19 +0200
committerMichal Kubecek <mkubecek@suse.cz>2019-09-19 00:26:29 +0200
commitdbb1da9419e785f3ebf775e827bf6da2c97d1d3d (patch)
treefa817e84fb4a38d3023c50238238578239f51eaa
parent270258c47a2baa5ef7a64afd9dc0bfe923ab16e2 (diff)
parent76ac02e35491f314b4c4d40cc5372cd12549c18a (diff)
Merge branch 'users/mkubecek/SLE15-SP2/for-next' into openSUSE-15.2openSUSE-15.2
- disable CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT also on armv7hl
-rw-r--r--config/arm64/default2
-rw-r--r--config/armv7hl/default2
-rw-r--r--config/armv7hl/lpae2
3 files changed, 3 insertions, 3 deletions
diff --git a/config/arm64/default b/config/arm64/default
index c9b09f104f..600f7335cb 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -8639,7 +8639,7 @@ CONFIG_TEGRA_IOMMU_SMMU=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
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 8304c45f2f..b611bbcfd2 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -8851,7 +8851,7 @@ CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
# CONFIG_EXYNOS_IOMMU 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_MTK_IOMMU=y
CONFIG_MTK_IOMMU_V1=y
CONFIG_QCOM_IOMMU=y
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index 5fac30edd7..71982c4e2d 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -8495,7 +8495,7 @@ CONFIG_ROCKCHIP_IOMMU=y
CONFIG_TEGRA_IOMMU_SMMU=y
# CONFIG_EXYNOS_IOMMU 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_MTK_IOMMU=y
CONFIG_MTK_IOMMU_V1=y
CONFIG_QCOM_IOMMU=y