diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-05-24 11:54:28 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-05-24 11:54:28 +0200 |
| commit | 86021ed118e9bc956640ce9155683f3356ad50cb (patch) | |
| tree | 0de3da236bb187e31b6a407e46215a8940e0ec31 /linux/drivers/media/video/Kconfig | |
| parent | 3806358efcb85863e495093fa74fb649167785b5 (diff) | |
| parent | a009555d3b8b9bbc985a8cb8ce2f834c7d77faf1 (diff) | |
| download | mediapointer-dvb-s2-86021ed118e9bc956640ce9155683f3356ad50cb.tar.gz mediapointer-dvb-s2-86021ed118e9bc956640ce9155683f3356ad50cb.tar.bz2 | |
Merge: from master.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/Kconfig')
| -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 5afcdf759..134af1cad 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -170,7 +170,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 && !PPC64 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 @@ -178,7 +178,7 @@ config VIDEO_STRADIS config VIDEO_ZORAN tristate "Zoran ZR36057/36067 Video For Linux" - depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 + depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && !PPC64 help Say Y for support for MJPEG capture cards based on the Zoran 36057/36067 PCI controller chipset. This includes the Iomega |