Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 62943
b: refs/heads/master
c: 52cf875
h: refs/heads/master
i:
  62941: 14ad1ed
  62939: aa47e0d
  62935: ae01f33
  62927: 1d2a317
  62911: 00e8fd3
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jul 26, 2007
1 parent 21200c3 commit a4258d4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c98dbe59ae4da701f81ba16eb02c94ed85e663c7
refs/heads/master: 52cf875fb0f3a8a472eaa8be479777cf0a92e3ce
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit a4258d4

Please sign in to comment.