diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-16 08:10:33 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-16 08:10:33 -0200 |
commit | 87e197f0fe6b6bdaaa5eb439ad8f2ce016f03929 (patch) | |
tree | 269d6c2e014927559332963a0e7a7518af383b79 /linux/drivers/media/video | |
parent | a441ca74b485183dd636eeab92312349ffda7394 (diff) | |
download | mediapointer-dvb-s2-87e197f0fe6b6bdaaa5eb439ad8f2ce016f03929.tar.gz mediapointer-dvb-s2-87e197f0fe6b6bdaaa5eb439ad8f2ce016f03929.tar.bz2 |
partially revert changeset a6db576db177
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Accidentally, VIRT_TO_BUS were removed by a previous changeset.
Reverting it.
This patch should be merged with changeset 6320:a6db576db177 at -git.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r-- | linux/drivers/media/video/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 8ceccd9ae..2e571eb93 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -516,7 +516,7 @@ config VIDEO_VINO config VIDEO_STRADIS tristate "Stradis 4:2:2 MPEG-2 video driver (EXPERIMENTAL)" - depends on EXPERIMENTAL && PCI && VIDEO_V4L1 + depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && VIRT_TO_BUS help Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video driver for PCI. There is a product page at @@ -527,7 +527,7 @@ config VIDEO_ZORAN_ZR36060 config VIDEO_ZORAN tristate "Zoran ZR36057/36067 Video For Linux" - depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 + depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS help Say Y for support for MJPEG capture cards based on the Zoran 36057/36067 PCI controller chipset. This includes the Iomega |