Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 89d8d37838a38a1b68e886c860c35d138955962d..3b26fbd3e5589e5203ca0c99c96bf4e5fbb5e91c 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -901,7 +901,7 @@ endif # V4L_USB_DRIVERS
 
 config SOC_CAMERA
        tristate "SoC camera support"
-       depends on VIDEO_V4L2
+       depends on VIDEO_V4L2 && HAS_DMA
        select VIDEOBUF_DMA_SG
        help
          SoC Camera is a common API to several cameras, not connecting