summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-06-29 01:03:46 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-07-24 20:35:21 -0700
commitd7f69eaa106a0b46474e116216a81f72ff28e507 (patch)
treeb22566f8aa64db175b95507b1df33fedac8bcf2f
parent6d4764bead69f0092049fa6fe409d1c989e75af6 (diff)
downloadlinux-stable-d7f69eaa106a0b46474e116216a81f72ff28e507.tar.gz
linux-stable-d7f69eaa106a0b46474e116216a81f72ff28e507.tar.bz2
linux-stable-d7f69eaa106a0b46474e116216a81f72ff28e507.zip
v4l/dvb: Kconfig: fix description and dependencies for saa7115 module
This Kconfig description is incorrect, due to a previous merge a while back. CONFIG_SAA711X builds module saa7115, which is the newer v4l2 module, and is not obsoleted. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/media/video/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 6b4197018561..67d729a84765 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -380,10 +380,10 @@ config VIDEO_WM8739
source "drivers/media/video/cx25840/Kconfig"
config VIDEO_SAA711X
- tristate "Philips SAA7113/4/5 video decoders (OBSOLETED)"
- depends on VIDEO_V4L1 && I2C && EXPERIMENTAL
+ tristate "Philips SAA7113/4/5 video decoders"
+ depends on VIDEO_DEV && I2C && EXPERIMENTAL
---help---
- Old support for the Philips SAA7113/4 video decoders.
+ Support for the Philips SAA7113/4/5 video decoders.
To compile this driver as a module, choose M here: the
module will be called saa7115.