diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-23 10:08:00 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-23 10:08:00 +0000 |
| commit | fc5fdeb9baf0a40a275635f2cc5280445e39c581 (patch) | |
| tree | 03d66d0dca3d1692e5265c498616e04db7da1962 /v4l | |
| parent | 58f7f4b40f2ca86934efbe37084be2e09ed3f0cf (diff) | |
| download | mediapointer-dvb-s2-fc5fdeb9baf0a40a275635f2cc5280445e39c581.tar.gz mediapointer-dvb-s2-fc5fdeb9baf0a40a275635f2cc5280445e39c581.tar.bz2 | |
* cx88-dvb.c, saa7134-dvb.c:
* scripts/merge-trees.sh, scripts/unmerge-trees.sh:
- fix compilation warning for missing lgdt3302 when
compiling against kernel 2.6.12 without DVB tree.
- replaced #IF CONFIG_DVB_* with #IFDEF CONFIG_DVB_*
- include linux/config.h
- Let kconfig / Makefile decide to include frontend-specific code.
(Properly functioning now)
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 12 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 34 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 34 |
3 files changed, 44 insertions, 36 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index fa5b99bae..521e43bf3 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-07-23 09:49 mkrufky + * cx88-dvb.c, saa7134-dvb.c: + * scripts/merge-trees.sh, scripts/unmerge-trees.sh: + - fix compilation warning for missing lgdt3302 when + compiling against kernel 2.6.12 without DVB tree. + - replaced #IF CONFIG_DVB_* with #IFDEF CONFIG_DVB_* + - include linux/config.h + - Let kconfig / Makefile decide to include frontend-specific code. + (Properly functioning now) + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-22 16:27 mkrufky * tveeprom.c: - Recognize the MFPE05-2 Tuner. diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 90021bed0..fbc9fa564 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -47,32 +47,30 @@ patch -p1 <<'DIFF' -install -m 644 -c $(inst_video) $(KDIR26)/video diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c ---- video4linux.orig/cx88-dvb.c 2005-07-21 23:35:26.000000000 +0000 -+++ video4linux/cx88-dvb.c 2005-07-21 23:35:52.000000000 +0000 -@@ -34,11 +34,7 @@ - #define CONFIG_DVB_MT352 1 - #define CONFIG_DVB_CX22702 1 - #define CONFIG_DVB_OR51132 1 +--- video4linux.orig/cx88-dvb.c 2005-07-23 05:35:09.000000000 +0000 ++++ video4linux/cx88-dvb.c 2005-07-23 05:36:30.000000000 +0000 +@@ -32,10 +32,6 @@ + #include <linux/config.h> + #include "compat.h" + -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) --#define CONFIG_DVB_LGDT3302 0 --#else - #define CONFIG_DVB_LGDT3302 1 +-#undef CONFIG_DVB_LGDT3302 -#endif - +- #include "cx88.h" #include "dvb-pll.h" + diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c ---- video4linux.orig/saa7134-dvb.c 2005-07-21 23:35:26.000000000 +0000 -+++ video4linux/saa7134-dvb.c 2005-07-21 23:36:19.000000000 +0000 -@@ -32,11 +32,7 @@ +--- video4linux.orig/saa7134-dvb.c 2005-07-23 05:35:09.000000000 +0000 ++++ video4linux/saa7134-dvb.c 2005-07-23 05:36:50.000000000 +0000 +@@ -32,10 +32,6 @@ + #include <linux/config.h> #include "compat.h" - #define CONFIG_DVB_MT352 1 --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13) - #define CONFIG_DVB_TDA1004X 1 --#else --#define CONFIG_DVB_TDA1004X 0 +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +-#undef CONFIG_DVB_TDA1004X -#endif +- #include "saa7134-reg.h" #include "saa7134.h" diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 6de4527cf..d3627aa5a 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -49,32 +49,30 @@ video4linux.orig/Makefile -install -m 644 -c $(inst_video) $(KDIR26)/video diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c ---- video4linux/cx88-dvb.c 2005-07-21 23:41:13.000000000 +0000 -+++ video4linux.orig/cx88-dvb.c 2005-07-21 23:39:50.000000000 +0000 -@@ -34,7 +34,11 @@ - #define CONFIG_DVB_MT352 1 - #define CONFIG_DVB_CX22702 1 - #define CONFIG_DVB_OR51132 1 +--- video4linux/cx88-dvb.c 2005-07-23 05:36:30.000000000 +0000 ++++ video4linux.orig/cx88-dvb.c 2005-07-23 05:35:09.000000000 +0000 +@@ -32,6 +32,10 @@ + #include <linux/config.h> + #include "compat.h" + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) -+#define CONFIG_DVB_LGDT3302 0 -+#else - #define CONFIG_DVB_LGDT3302 1 ++#undef CONFIG_DVB_LGDT3302 +#endif - ++ #include "cx88.h" #include "dvb-pll.h" + diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c ---- video4linux/saa7134-dvb.c 2005-07-21 23:41:13.000000000 +0000 -+++ video4linux.orig/saa7134-dvb.c 2005-07-21 23:39:50.000000000 +0000 -@@ -32,7 +32,11 @@ +--- video4linux/saa7134-dvb.c 2005-07-23 05:36:50.000000000 +0000 ++++ video4linux.orig/saa7134-dvb.c 2005-07-23 05:35:09.000000000 +0000 +@@ -32,6 +32,10 @@ + #include <linux/config.h> #include "compat.h" - #define CONFIG_DVB_MT352 1 -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13) - #define CONFIG_DVB_TDA1004X 1 -+#else -+#define CONFIG_DVB_TDA1004X 0 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) ++#undef CONFIG_DVB_TDA1004X +#endif ++ #include "saa7134-reg.h" #include "saa7134.h" |