OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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 <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Michael Krufky 2005-07-27 11:45:58 -07:00 committed by Linus Torvalds
parent 0b1cd0c774
commit 84de2eff13
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/video/cx88/Makefile
View File

@ -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
drivers/media/video/cx88/cx88-dvb.c
View File

@ -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"

6
drivers/media/video/saa7134/Makefile
View File

@ -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
drivers/media/video/saa7134/saa7134-dvb.c
View File

@ -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 <kraxel@bytesex.org> [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"