From 620f218e15c2fdabc3b36675ece2889bb30a8732 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 24 Jul 2005 22:37:22 +0000 Subject: * cx88-dvb.c, saa7134-dvb.c, Makefile: - The #define CONFIG_DVB_* are actually CFLAGS set my Makefile. CONFIG_* namespace is reserved for Kconfig. This renames them back to HAVE_*. Signed-off-by: Michael Krufky --- v4l/scripts/merge-trees.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'v4l/scripts/merge-trees.sh') diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index fbc9fa564..de987444d 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -54,7 +54,7 @@ diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c #include "compat.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) --#undef CONFIG_DVB_LGDT3302 +-#undef HAVE_LGDT3302 -#endif - #include "cx88.h" @@ -68,7 +68,7 @@ diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c #include "compat.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) --#undef CONFIG_DVB_TDA1004X +-#undef HAVE_TDA1004X -#endif - #include "saa7134-reg.h" -- cgit v1.2.3