From ecf4d8a4c5cc6aa74cbbd62924750c0d46b6e672 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Wed, 21 Sep 2005 00:56:30 +0000
Subject: 	* compat.h: 	* cx88-dvb.c: 	* saa7134-dvb.c: 	*
 scripts/merge-trees.sh: 	* scripts/unmerge-trees.sh: 	- move some
 #if kernel version into compat.h

	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
---
 linux/drivers/media/video/cx88/cx88-dvb.c       | 6 +-----
 linux/drivers/media/video/saa7134/saa7134-dvb.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index d179f2d66..4e79d2cdd 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.66 2005/09/07 05:32:20 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.67 2005/09/21 00:56:30 mkrufky Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -31,10 +31,6 @@
 #include <linux/suspend.h>
 #include "compat.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-#undef HAVE_LGDT330X
-#endif
-
 #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 cd3a3aaa3..076225b44 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.27 2005/09/12 20:18:41 hhackmann Exp $
+ * $Id: saa7134-dvb.c,v 1.28 2005/09/21 00:56:30 mkrufky Exp $
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
@@ -31,10 +31,6 @@
 #include <linux/suspend.h>
 #include "compat.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-#undef HAVE_TDA1004X
-#endif
-
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
-- 
cgit v1.2.3