diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2011-09-14 16:03:45 +0200 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-09-14 16:06:04 +0200 |
commit | 7b6d45f139262aa7b1b604a67963e5c8c01304d3 (patch) | |
tree | 037053c8d38952c3018e6a0bbeae131f61c0f873 /drivers/iommu | |
parent | 5e1b612cb16f446996398bd23b6cd59ea0206938 (diff) | |
download | talos-obmc-linux-7b6d45f139262aa7b1b604a67963e5c8c01304d3.tar.gz talos-obmc-linux-7b6d45f139262aa7b1b604a67963e5c8c01304d3.zip |
iommu/omap: Fix build error with !IOMMU_SUPPORT
Without this patch it is possible to select the VIDEO_OMAP3
driver which then selects OMAP_IOVMM. But the omap iommu
driver is not compiled without IOMMU_SUPPORT enabled. Fix
that by forcing OMAP_IOMMU and OMAP_IOVMM are enabled before
VIDEO_OMAP3 can be selected.
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Cc: iommu@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index d901930a8f83..ae46776c1b80 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -114,8 +114,8 @@ config OMAP_IOMMU select IOMMU_API config OMAP_IOVMM - tristate - select OMAP_IOMMU + tristate "OMAP IO Virtual Memory Manager Support" + depends on OMAP_IOMMU config OMAP_IOMMU_DEBUG tristate "Export OMAP IOMMU/IOVMM internals in DebugFS" |