diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
| commit | 593195f9b2309693f27b402f34573f7920b82c3e (patch) | |
| tree | 54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/video/Kconfig | |
| parent | 983d5dbdb2b38d024935f560a91cddcf704875f3 (diff) | |
| parent | f9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/Kconfig')
| -rw-r--r-- | drivers/media/video/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 2fe260fff85d..d82c8a30ba44 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -183,7 +183,7 @@ config VIDEO_STRADIS | |||
| 183 | help | 183 | help |
| 184 | Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video | 184 | Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video |
| 185 | driver for PCI. There is a product page at | 185 | driver for PCI. There is a product page at |
| 186 | <http://www.stradis.com/decoder.html>. | 186 | <http://www.stradis.com/>. |
| 187 | 187 | ||
| 188 | config VIDEO_ZORAN | 188 | config VIDEO_ZORAN |
| 189 | tristate "Zoran ZR36057/36067 Video For Linux" | 189 | tristate "Zoran ZR36057/36067 Video For Linux" |