diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-24 22:37:22 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-24 22:37:22 +0000 |
| commit | 620f218e15c2fdabc3b36675ece2889bb30a8732 (patch) | |
| tree | f06d47a3c5acd7a0b4be436159dfb58883f9b092 /v4l | |
| parent | a32937737de1ff8bb8609392d57d8df79f94562e (diff) | |
| download | mediapointer-dvb-s2-620f218e15c2fdabc3b36675ece2889bb30a8732.tar.gz mediapointer-dvb-s2-620f218e15c2fdabc3b36675ece2889bb30a8732.tar.bz2 | |
* 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 <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 4 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 4 |
2 files changed, 4 insertions, 4 deletions
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" diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index d3627aa5a..49f22b3a0 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -56,7 +56,7 @@ diff -upr video4linux/cx88-dvb.c video4linux.orig/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" @@ -70,7 +70,7 @@ diff -upr video4linux/saa7134-dvb.c video4linux.orig/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" |