summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2015-02-04 16:27:23 +0100
committerNicolas Chauvet <kwizart@gmail.com>2015-02-15 23:16:24 +0100
commit4ca8f4550a675f469d5eb5ed7f088c77fdfacdb5 (patch)
tree1d474ebf22114aabf2e5ccbe87f731e4dbc2d5b9
parent4c8ffdd1ae77b2281bdf336b489f5f7c1d657f66 (diff)
downloadkernel-f21-3.18-armada.tar.gz
kernel-f21-3.18-armada.tar.xz
kernel-f21-3.18-armada.zip
Disable BROKEN EXYNOS_IOMMUf21-3.18-armada
-rw-r--r--config-armv7-generic4
1 files changed, 2 insertions, 2 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index c2b071c4..34e50fcd 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -225,7 +225,7 @@ CONFIG_EXYNOS_ADC=m
CONFIG_MMC_SDHCI_S3C=m
CONFIG_MMC_SDHCI_S3C_DMA=y
CONFIG_MMC_DW_EXYNOS=m
-CONFIG_EXYNOS_IOMMU=y
+# CONFIG_EXYNOS_IOMMU is not set
CONFIG_PCI_EXYNOS=y
CONFIG_PHY_EXYNOS5_USBDRD=m
CONFIG_USB_EHCI_EXYNOS=m
@@ -258,7 +258,7 @@ CONFIG_DRM_EXYNOS_FIMD=y
CONFIG_DRM_EXYNOS_G2D=y
CONFIG_DRM_EXYNOS_GSC=y
CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_IOMMU=y
+# CONFIG_DRM_EXYNOS_IOMMU is not set
CONFIG_DRM_EXYNOS_IPP=y
CONFIG_DRM_EXYNOS_ROTATOR=y
CONFIG_DRM_EXYNOS_VIDI=y