diff options
| author | Michael Krufky <devnull@localhost> | 2005-09-24 17:22:52 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-09-24 17:22:52 +0000 |
| commit | c358afb43ee91639930fba628f13a4d8d0e261c4 (patch) | |
| tree | 986e791e0f989323fcaf4f33893a45e94b0f21fb /v4l | |
| parent | 5e0ea2634ac48cd6daceea8906d77065e677f61c (diff) | |
| download | mediapointer-dvb-s2-c358afb43ee91639930fba628f13a4d8d0e261c4.tar.gz mediapointer-dvb-s2-c358afb43ee91639930fba628f13a4d8d0e261c4.tar.bz2 | |
* compat.h:
- Allow tda1004x & lgdt330x support in tree-merge for all kernels.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 9 | ||||
| -rw-r--r-- | v4l/compat.h | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 5605f8589..f721d8016 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-09-24 17:03 mkrufky + + * compat.h: + - Previous commit prevents tda1004x & lgdt330x support in tree-merge + for kernels < 2.6.13. Fixed using DVB_CVS flag, set in tree-merge + Makefile. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-09-24 01:05 mkrufky * bttv-cards.c: diff --git a/v4l/compat.h b/v4l/compat.h index 29fd5051a..66f10d155 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.19 2005/09/21 00:56:30 mkrufky Exp $ + * $Id: compat.h,v 1.20 2005/09/24 17:22:52 mkrufky Exp $ */ #ifndef _COMPAT_H @@ -115,10 +115,12 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) #define pm_message_t u32 #endif +#ifndef DVB_CVS #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) #undef HAVE_LGDT330X #undef HAVE_TDA1004X #endif +#endif #endif /* |