summaryrefslogtreecommitdiff
path: root/v4l/compat.h
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-09-24 17:22:52 +0000
committerMichael Krufky <devnull@localhost>2005-09-24 17:22:52 +0000
commitc358afb43ee91639930fba628f13a4d8d0e261c4 (patch)
tree986e791e0f989323fcaf4f33893a45e94b0f21fb /v4l/compat.h
parent5e0ea2634ac48cd6daceea8906d77065e677f61c (diff)
downloadmediapointer-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/compat.h')
-rw-r--r--v4l/compat.h4
1 files changed, 3 insertions, 1 deletions
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
/*