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 (file)
index 0000000..c007bf4
--- /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 <mkrufky@linuxtv.org>
+To: stable@kernel.org
+Cc: v4l-dvb maintainer list <v4l-dvb-maintainer@linuxtv.org>, Mauro Carvalho Chehab <mchehab@infradead.org>
+Subject: v4l/dvb: Kconfig: fix description and dependencies for saa7115 module
+
+From: Michael Krufky <mkrufky@linuxtv.org>
+
+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>
+---
+
+ 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 11d96935a324c57faf75fe90ba018b29b37e2edd..321f2a51c7a4e49e479c48bf9445050c91977d48 100644 (file)
--- 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