From: Chris Wright Date: Thu, 6 Jul 2006 19:58:23 +0000 (-0700) Subject: v4l/dvb kconfig fix, fwd from Michael Krufky X-Git-Tag: v2.6.17.7~15^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a07ab559504ece05be0db666782724c6370bde66;p=thirdparty%2Fkernel%2Fstable-queue.git v4l/dvb kconfig fix, fwd from Michael Krufky --- diff --git a/queue-2.6.17/kconfig-fix-description-and-dependencies-for-saa7115-module.patch b/queue-2.6.17/kconfig-fix-description-and-dependencies-for-saa7115-module.patch new file mode 100644 index 00000000000..c007bf41c2e --- /dev/null +++ b/queue-2.6.17/kconfig-fix-description-and-dependencies-for-saa7115-module.patch @@ -0,0 +1,36 @@ +From stable-bounces@linux.kernel.org Wed Jun 28 22:04:17 2006 +Date: Thu, 29 Jun 2006 01:03:46 -0400 +From: Michael Krufky +To: stable@kernel.org +Cc: v4l-dvb maintainer list , Mauro Carvalho Chehab +Subject: v4l/dvb: Kconfig: fix description and dependencies for saa7115 module + +From: Michael Krufky + +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 +--- + + drivers/media/video/Kconfig | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- linux-2.6.17.3.orig/drivers/media/video/Kconfig ++++ linux-2.6.17.3/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. diff --git a/queue-2.6.17/series b/queue-2.6.17/series index 11d96935a32..321f2a51c7a 100644 --- a/queue-2.6.17/series +++ b/queue-2.6.17/series @@ -10,3 +10,4 @@ pnp-suppress-request_irq-warning.patch reduce-acpi-verbosity-on-null-handle-condition.patch via-velocity-the-link-is-not-correctly-detected-when-the-device-starts.patch 2-oopses-in-ethtool.patch +kconfig-fix-description-and-dependencies-for-saa7115-module.patch