diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 13:52:34 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 13:52:34 +0900 |
| commit | baea90ea14b316e4599f000c713e446908a5aef6 (patch) | |
| tree | 17eae40f15832b466121d8f962028472c4568a13 /drivers/media/video/omap/Kconfig | |
| parent | 36239c6704b71da7fb8e2a9429e159a84d0c5a3e (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
| download | op-kernel-dev-baea90ea14b316e4599f000c713e446908a5aef6.zip op-kernel-dev-baea90ea14b316e4599f000c713e446908a5aef6.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/omap/Kconfig')
| -rw-r--r-- | drivers/media/video/omap/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/omap/Kconfig b/drivers/media/video/omap/Kconfig index 97c53949..e63233fd 100644 --- a/drivers/media/video/omap/Kconfig +++ b/drivers/media/video/omap/Kconfig @@ -1,8 +1,8 @@ config VIDEO_OMAP2_VOUT tristate "OMAP2/OMAP3 V4L2-Display driver" - depends on ARCH_OMAP24XX || ARCH_OMAP34XX + depends on ARCH_OMAP2 || ARCH_OMAP3 select VIDEOBUF_GEN - select VIDEOBUF_DMA_SG + select VIDEOBUF_DMA_CONTIG select OMAP2_DSS select OMAP2_VRAM select OMAP2_VRFB |
