diff options
| author | Michael Krufky <devnull@localhost> | 2005-09-21 00:56:30 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-09-21 00:56:30 +0000 |
| commit | ecf4d8a4c5cc6aa74cbbd62924750c0d46b6e672 (patch) | |
| tree | 44d136b157c6fd1aaa2b56e2e7656bdefa0a97d1 /linux | |
| parent | cc332c813f85647f7cdd57a25a2516b56971d3b0 (diff) | |
| download | mediapointer-dvb-s2-ecf4d8a4c5cc6aa74cbbd62924750c0d46b6e672.tar.gz mediapointer-dvb-s2-ecf4d8a4c5cc6aa74cbbd62924750c0d46b6e672.tar.bz2 | |
* 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>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 6 |
2 files changed, 2 insertions, 10 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" |