Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index d4a6e56..3e9e0dc 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -630,7 +630,7 @@ config VIDEO_ZORAN_ZR36060
        depends on VIDEO_ZORAN
        help
          Say Y to support Zoran boards based on 36060 chips.
-         This includes Iomega Bus, Pinnacle DC10, Linux media Labs 33
+         This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33
          and 33 R10 and AverMedia 6 boards.
 
 config VIDEO_ZORAN_BUZ
@@ -968,7 +968,7 @@ config VIDEO_PXA27x
 
 config VIDEO_SH_MOBILE_CEU
        tristate "SuperH Mobile CEU Interface driver"
-       depends on VIDEO_DEV
+       depends on VIDEO_DEV && HAS_DMA
        select SOC_CAMERA
        select VIDEOBUF_DMA_CONTIG
        ---help---