From a4258d4c89f41d8c65a0eb4653c73c95f07fed32 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 26 Jul 2007 17:32:59 +0100 Subject: [PATCH] --- yaml --- r: 62943 b: refs/heads/master c: 52cf875fb0f3a8a472eaa8be479777cf0a92e3ce h: refs/heads/master i: 62941: 14ad1ed54ddc52b0fb46dee233dbc0136b339f77 62939: aa47e0d2af8891428fc351d894c86c7292a1b4d7 62935: ae01f33b8613bf50ac436fa7886a58411f4ce0c2 62927: 1d2a317fb67a32a82c5092e816882bfa496d3822 62911: 00e8fd39224dba3e43c806469169d3909d05067b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0d3a058f81e2..307f2c7ad1dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c98dbe59ae4da701f81ba16eb02c94ed85e663c7 +refs/heads/master: 52cf875fb0f3a8a472eaa8be479777cf0a92e3ce diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 9dcbffd0aa15..e204e7b4028a 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -509,7 +509,7 @@ config VIDEO_VINO config VIDEO_STRADIS tristate "Stradis 4:2:2 MPEG-2 video driver (EXPERIMENTAL)" - depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && !PPC64 + 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 @@ -520,7 +520,7 @@ config VIDEO_ZORAN_ZR36060 config VIDEO_ZORAN tristate "Zoran ZR36057/36067 Video For Linux" - depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && !PPC64 + 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