[-mm PATCH] v4l: hybrid dvb: move #defines to Makefile

This patch moves #define from cx88-dvb.c and saa7134-dvb.c into Makefile
as CFLAGS, allowing code compatability with video4linux cvs.

Signed-off-by: Michael Krufky <[email protected]>

 linux/drivers/media/video/cx88/Makefile         |   12 ++++++++++++
 linux/drivers/media/video/cx88/cx88-dvb.c       |    7 ++-----
 linux/drivers/media/video/saa7134/Makefile      |    6 ++++++
 linux/drivers/media/video/saa7134/saa7134-dvb.c |    5 ++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diff -u linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c linux/drivers/media/video/cx88/cx88-dvb.c
--- linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c	2005-07-23 19:19:52.000000000 +0000
+++ linux/drivers/media/video/cx88/cx88-dvb.c	2005-07-23 19:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.49 2005/07/20 05:38:09 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.50 2005/07/23 10:08:00 mkrufky Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -29,11 +29,8 @@
 #include <linux/kthread.h>
 #include <linux/file.h>
 #include <linux/suspend.h>
+#include <linux/config.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 -u linux-2.6.13/drivers/media/video/saa7134/saa7134-dvb.c linux/drivers/media/video/saa7134/saa7134-dvb.c
--- linux-2.6.13/drivers/media/video/saa7134/saa7134-dvb.c	2005-07-23 19:19:52.000000000 +0000
+++ linux/drivers/media/video/saa7134/saa7134-dvb.c	2005-07-23 19:42:45.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-dvb.c,v 1.18 2005/07/04 16:05:50 mkrufky Exp $
+ * $Id: saa7134-dvb.c,v 1.22 2005/07/23 10:08:00 mkrufky Exp $
  *
  * (c) 2004 Gerd Knorr <[email protected]> [SuSE Labs]
  *
@@ -29,9 +29,8 @@
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/suspend.h>
+#include <linux/config.h>
 
-#define CONFIG_DVB_MT352 1
-#define CONFIG_DVB_TDA1004X 1
 
 #include "saa7134-reg.h"
 #include "saa7134.h"
diff -u linux-2.6.13/drivers/media/video/cx88/Makefile linux/drivers/media/video/cx88/Makefile
--- linux-2.6.13/drivers/media/video/cx88/Makefile	2005-06-17 19:48:29.000000000 +0000
+++ linux/drivers/media/video/cx88/Makefile	2005-07-23 19:42:45.000000000 +0000
@@ -9,3 +9,15 @@
 EXTRA_CFLAGS += -I$(src)/..
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
+ifneq ($(CONFIG_DVB_CX22702),n)
+ EXTRA_CFLAGS += -DCONFIG_DVB_CX22702=1
+endif
+ifneq ($(CONFIG_DVB_OR51132),n)
+ EXTRA_CFLAGS += -DCONFIG_DVB_OR51132=1
+endif
+ifneq ($(CONFIG_DVB_LGDT3302),n)
+ EXTRA_CFLAGS += -DCONFIG_DVB_LGDT3302=1
+endif
+ifneq ($(CONFIG_DVB_MT352),n)
+ EXTRA_CFLAGS += -DCONFIG_DVB_MT352=1
+endif
diff -u linux-2.6.13/drivers/media/video/saa7134/Makefile linux/drivers/media/video/saa7134/Makefile
--- linux-2.6.13/drivers/media/video/saa7134/Makefile	2005-06-17 19:48:29.000000000 +0000
+++ linux/drivers/media/video/saa7134/Makefile	2005-07-23 19:42:45.000000000 +0000
@@ -9,3 +9,9 @@
 EXTRA_CFLAGS += -I$(src)/..
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
+ifneq ($(CONFIG_DVB_MT352),n)
+ EXTRA_CFLAGS += -DCONFIG_DVB_MT352=1
+endif
+ifneq ($(CONFIG_DVB_TDA1004X),n)
+ EXTRA_CFLAGS += -DCONFIG_DVB_TDA1004X=1
+endif

---

• Follow-Ups:
  • [-mm PATCH] v4l: hybrid dvb: rename CFLAGS from CONFIG_DVB_xxxx back to original HAVE_xxxx
    • From: Michael Krufky <[email protected]>

• References:
  • [-mm PATCH] v4l: hybrid dvb: fix warnings with -Wundef
    • From: Michael Krufky <[email protected]>

• Prev by Date: [-mm PATCH] v4l: hybrid dvb: fix warnings with -Wundef
• Next by Date: Re: [PATCH 2.6.13rc3] IPv6: Check interface bindings on IPv6 raw socket reception
• Previous by thread: [-mm PATCH] v4l: hybrid dvb: fix warnings with -Wundef
• Next by thread: [-mm PATCH] v4l: hybrid dvb: rename CFLAGS from CONFIG_DVB_xxxx back to original HAVE_xxxx
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]