aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-dvb.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@m1k.net>2005-07-27 11:45:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:26:17 -0700
commit84de2eff1390a89a76507abc3073dad8de751869 (patch)
treed132b0a93d69467a2100e45a473dad05bdd69c29 /drivers/media/video/saa7134/saa7134-dvb.c
parent[PATCH] v4l: hybrid dvb: fix warnings with -Wundef (diff)
downloadlinux-dev-84de2eff1390a89a76507abc3073dad8de751869.tar.xz
linux-dev-84de2eff1390a89a76507abc3073dad8de751869.zip
[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>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-dvb.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 48400e0cb34f..8d7b205fa515 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -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"