diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 | ||||
| -rw-r--r-- | v4l/compat.h | 7 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 28 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 28 |
6 files changed, 19 insertions, 67 deletions
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" diff --git a/v4l/ChangeLog b/v4l/ChangeLog index d7f1e2966..5b5be6b2d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-09-21 00:53 mkrufky + + * 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> + 2005-09-19 15:28 mchehab * tvp5150.c,tvp5150_reg.h: diff --git a/v4l/compat.h b/v4l/compat.h index 505031f12..29fd5051a 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.18 2005/09/19 01:20:14 mkrufky Exp $ + * $Id: compat.h,v 1.19 2005/09/21 00:56:30 mkrufky Exp $ */ #ifndef _COMPAT_H @@ -115,6 +115,11 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) #define pm_message_t u32 #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +#undef HAVE_LGDT330X +#undef HAVE_TDA1004X +#endif + #endif /* * Local variables: diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index edc7c8a3a..a9ffa2b35 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -118,31 +118,3 @@ diff -up video4linux.orig/Makefile video4linux/Makefile $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \ $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \ $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null -diff -up video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c ---- video4linux.orig/cx88-dvb.c 2005-08-17 00:48:25.000000000 +0000 -+++ video4linux/cx88-dvb.c 2005-08-17 00:49:02.000000000 +0000 -@@ -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 -up video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c ---- video4linux.orig/saa7134-dvb.c 2005-08-17 00:48:25.000000000 +0000 -+++ video4linux/saa7134-dvb.c 2005-08-17 00:49:02.000000000 +0000 -@@ -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" - diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 6458cd0e8..bd5b0ee2c 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -118,31 +118,3 @@ diff -up video4linux/Makefile video4linux.orig/Makefile $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \ $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \ $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null -diff -up video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c ---- video4linux/cx88-dvb.c 2005-08-17 00:49:02.000000000 +0000 -+++ video4linux.orig/cx88-dvb.c 2005-08-17 00:48:25.000000000 +0000 -@@ -31,6 +31,10 @@ - #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 -up video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c ---- video4linux/saa7134-dvb.c 2005-08-17 00:49:02.000000000 +0000 -+++ video4linux.orig/saa7134-dvb.c 2005-08-17 00:48:25.000000000 +0000 -@@ -31,6 +31,10 @@ - #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" - |