v4l/dvb Kconfig fix, fwd from Michael Krufky

diff --git a/queue/kconfig-video_decoder-must-select-fw_loader.patch b/queue/kconfig-video_decoder-must-select-fw_loader.patch
new file mode 100644 (file)
index 0000000..9fcef90
--- /dev/null
+++ b/queue/kconfig-video_decoder-must-select-fw_loader.patch
@@ -0,0 +1,30 @@
+From stable-bounces@linux.kernel.org  Mon Mar 20 19:35:28 2006
+Date: Mon, 20 Mar 2006 22:34:58 -0500
+From: Michael Krufky <mkrufky@linuxtv.org>
+To: stable@kernel.org
+Cc: v4l-dvb maintainer list <v4l-dvb-maintainer@linuxtv.org>, lkml <linux-kernel@vger.kernel.org>, Mauro Carvalho Chehab <mchehab@infradead.org>
+Subject: [PATCH] Kconfig: VIDEO_DECODER must select FW_LOADER
+
+From: Michael Krufky <mkrufky@linuxtv.org>
+
+The cx25840 module requires external firmware in order to function,
+so it must select FW_LOADER, but saa7115 and saa7129 do not require it.
+
+Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/media/video/Kconfig |    1 +
+ 1 files changed, 1 insertion(+)
+
+--- linux-2.6.15.6.orig/drivers/media/video/Kconfig
++++ linux-2.6.15.6/drivers/media/video/Kconfig
+@@ -340,6 +340,7 @@ config VIDEO_AUDIO_DECODER
+ config VIDEO_DECODER
+       tristate "Add support for additional video chipsets"
+       depends on VIDEO_DEV && I2C && EXPERIMENTAL
++      select FW_LOADER
+       ---help---
+         Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
+         video  decoders.

diff --git a/queue/series b/queue/series
index 9d688db1d580c85fb42055530f5a89bbd14520c8..a665635570ce450d8eaba41e7b91d63759751a97 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -2,3 +2,4 @@ ib-srp-don-t-send-task-management-commands-after-target-removal.patch
 netfilter-ip_queue-fix-wrong-skb-len-nlmsg_len-assumption.patch
 compat-ifconf-fix-limits.patch
 cramfs-mounts-provide-corrupted-content-since-2.6.15.patch
+kconfig-video_decoder-must-select-fw_loader.patch