Skip to content

Commit

Permalink
[PATCH] v4l: hybrid dvb: move #defines to Makefile
Browse files Browse the repository at this point in the history
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]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Michael Krufky authored and Linus Torvalds committed Jul 27, 2005
1 parent 0b1cd0c commit 84de2ef
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 8 deletions.
12 changes: 12 additions & 0 deletions drivers/media/video/cx88/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
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
7 changes: 2 additions & 5 deletions drivers/media/video/cx88/cx88-dvb.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions drivers/media/video/saa7134/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
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
5 changes: 2 additions & 3 deletions drivers/media/video/saa7134/saa7134-dvb.c
Original file line number Diff line number Diff line change
@@ -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]
*
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 84de2ef

Please sign in to comment.