[PATCH -rc2-mm2] BUG FIX - v4l broken hybrid dvb inclusion

Michael Krufky
2005-07-12T15:08:51Z

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

There was a change made in 2.6.13-rc2-mm2 within both of the following
patches:

v4l-saa7134-hybrid-dvb.patch
v4l-cx88-update.patch

The specific change that caused this problem is:

- Let Kconfig decide whether to include frontend-specific code.

I had tested this change against 2.6.13-rc2-mm1, and it worked perfectly as expected, but it caused problems in today's 2.6.13-rc2-mm2 release. For some reason, the symbols don't get set properly. The following patch corrects this problem and restores previous behavior. We will eventually have to remove these symbols alltogether when we find a better solution, but this will fix the bug until then.

[-- Attachment #2: v4l-broken-hybrid-dvb-inclusion-fix.patch --]
[-- Type: text/plain, Size: 1269 bytes --]

Always include dvb frontend code for hybrid cx88 and saa7134 boards.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>

cx88/cx88-dvb.c | 5 +++++
saa7134/saa7134-dvb.c | 3 +++
2 files changed, 8 insertions(+)

diff -upr linux-2.6.13-rc2-mm2.orig/drivers/media/video/cx88/cx88-dvb.c linux/drivers/media/video/cx88/cx88-dvb.c
--- linux-2.6.13-rc2-mm2.orig/drivers/media/video/cx88/cx88-dvb.c 2005-07-12 08:56:58.000000000 +0000
+++ linux/drivers/media/video/cx88/cx88-dvb.c 2005-07-12 09:01:13.000000000 +0000
@@ -30,6 +30,11 @@
#include <linux/file.h>
#include <linux/suspend.h>

+#define CONFIG_DVB_MT352 1
+#define CONFIG_DVB_CX22702 1
+#define CONFIG_DVB_OR51132 1
+#define CONFIG_DVB_LGDT3302 1
+
#include "cx88.h"
#include "dvb-pll.h"

diff -upr linux-2.6.13-rc2-mm2.orig/drivers/media/video/saa7134/saa7134-dvb.c linux/drivers/media/video/saa7134/saa7134-dvb.c
--- linux-2.6.13-rc2-mm2.orig/drivers/media/video/saa7134/saa7134-dvb.c 2005-07-12 08:56:59.000000000 +0000
+++ linux/drivers/media/video/saa7134/saa7134-dvb.c 2005-07-12 09:01:55.000000000 +0000
@@ -30,6 +30,9 @@
#include <linux/kthread.h>
#include <linux/suspend.h>

+#define CONFIG_DVB_MT352 1
+#define CONFIG_DVB_TDA1004X 1
+
#include "saa7134-reg.h"
#include "saa7134.h"