drm/i915: reorder edp disabling to fix ivb MacBook Air

[karo-tx-linux.git] / drivers / iommu / Kconfig

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 34089372753893ab3cf0a247d097fd3f4f67c688..9f69b561f5dbdde95d2e0356e0eed2f98778d056 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -13,6 +13,10 @@ menuconfig IOMMU_SUPPORT
 
 if IOMMU_SUPPORT
 
+config OF_IOMMU
+       def_bool y
+       depends on OF
+
 # MSM IOMMU support
 config MSM_IOMMU
        bool "MSM IOMMU Support"
@@ -154,7 +158,7 @@ config TEGRA_IOMMU_GART
 
 config TEGRA_IOMMU_SMMU
        bool "Tegra SMMU IOMMU Support"
-       depends on ARCH_TEGRA_3x_SOC
+       depends on ARCH_TEGRA_3x_SOC && TEGRA_AHB
        select IOMMU_API
        help
          Enables support for remapping discontiguous physical memory