4 files changed, 20 insertions, 11 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index 5e15a8ea6..31e991e00 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.45 2005/07/15 21:44:14 mchehab Exp $
+ * $Id: cx88-dvb.c,v 1.46 2005/07/15 23:59:43 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -29,13 +29,17 @@
 #include <linux/kthread.h>
 #include <linux/file.h>
 #include <linux/suspend.h>
+#include "compat.h"
 
 #define CONFIG_DVB_MT352 1
 #define CONFIG_DVB_CX22702 1
 #define CONFIG_DVB_OR51132 1
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
+#define CONFIG_DVB_LGDT3302 0
+#else
 #define CONFIG_DVB_LGDT3302 1
+#endif
 
-#include "compat.h"
 #include "cx88.h"
 #include "dvb-pll.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index 1424eb217..822bd7ce9 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-dvb.c,v 1.20 2005/07/15 21:44:14 mchehab Exp $
+ * $Id: saa7134-dvb.c,v 1.21 2005/07/15 23:59:43 mchehab Exp $
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
@@ -29,11 +29,14 @@
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/suspend.h>
+#include "compat.h"
 
 #define CONFIG_DVB_MT352 1
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
 #define CONFIG_DVB_TDA1004X 1
-
-#include "compat.h"
+#else
+#define CONFIG_DVB_TDA1004X 0
+#endif
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
@@ -386,7 +389,7 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
 	return 0;
 }
 
-
+#if CONFIG_DVB_TDA1004X
 static struct tda1004x_config medion_cardbus = {
 	.demod_address = 0x08,
 	.invert        = 1,
@@ -399,6 +402,7 @@ static struct tda1004x_config medion_cardbus = {
 	.pll_sleep	   = philips_fmd1216_analog,
 	.request_firmware = NULL,
 };
+#endif
 
 /* ------------------------------------------------------------------ */
 
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 4563b5871..60aebbab9 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-16 00:00  mchehab
+	* Makefile, cx88-dvb.c, saa7134-dvb.c:
+	- Now compiling also with linux-2.6.12 version.
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-07-15 21:32  mchehab
 
 	* videodev.h:
diff --git a/v4l/Makefile b/v4l/Makefile
index 1860c169a..44057bf92 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -58,14 +58,9 @@ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
 ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
  EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1
- EXTRA_CFLAGS += -DCONFIG_DVB_CX22702=1
- EXTRA_CFLAGS += -DCONFIG_DVB_OR51132=1
- EXTRA_CFLAGS += -DCONFIG_DVB_LGDT3302=1
- EXTRA_CFLAGS += -DCONFIG_DVB_MT352=1
 endif
 ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m)
  EXTRA_CFLAGS += -DCONFIG_DVB_MT352=1
- EXTRA_CFLAGS += -DCONFIG_DVB_TDA1004X=1
 endif
 
 #################################################