From: Michael Krufky Date: Thu, 29 Jun 2006 05:03:46 +0000 (-0400) Subject: v4l/dvb: Kconfig: fix description and dependencies for saa7115 module X-Git-Tag: v2.6.17.7~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7f69eaa106a0b46474e116216a81f72ff28e507;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 6b41970185610..67d729a847653 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.