diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-09-14 10:03:45 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-09-14 10:06:04 -0400 |
| commit | 7b6d45f139262aa7b1b604a67963e5c8c01304d3 (patch) | |
| tree | 037053c8d38952c3018e6a0bbeae131f61c0f873 /drivers/media | |
| parent | 5e1b612cb16f446996398bd23b6cd59ea0206938 (diff) | |
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/media')
| -rw-r--r-- | drivers/media/video/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 6a25fad56655..620106937ec6 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -763,8 +763,7 @@ source "drivers/media/video/m5mols/Kconfig" | |||
| 763 | 763 | ||
| 764 | config VIDEO_OMAP3 | 764 | config VIDEO_OMAP3 |
| 765 | tristate "OMAP 3 Camera support (EXPERIMENTAL)" | 765 | tristate "OMAP 3 Camera support (EXPERIMENTAL)" |
| 766 | select OMAP_IOVMM | 766 | depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL |
| 767 | depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL | ||
| 768 | ---help--- | 767 | ---help--- |
| 769 | Driver for an OMAP 3 camera controller. | 768 | Driver for an OMAP 3 camera controller. |
| 770 | 769 | ||