diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-25 05:41:54 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-25 05:41:54 (GMT) |
| commit | 98d350cf7ae077eb8083ccc7c1bfc838344ac590 (patch) | |
| tree | dfee7af0eff981b941db6bdbd1d5f039f9f85407 /drivers/media/platform/Kconfig | |
| parent | a10d60c08cc3bbea9195e2b36440f557373623eb (diff) | |
| parent | 0bdb3ccd02509a4380d54efd85effc6a9902d4fd (diff) | |
| download | linux-98d350cf7ae077eb8083ccc7c1bfc838344ac590.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/platform/Kconfig')
| -rw-r--r-- | drivers/media/platform/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 20f1655..8108c69 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -93,7 +93,9 @@ config VIDEO_M32R_AR_M64278 config VIDEO_OMAP3 tristate "OMAP 3 Camera support" - depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 + depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 + select ARM_DMA_USE_IOMMU + select OMAP_IOMMU ---help--- Driver for an OMAP 3 camera controller. |