From c358afb43ee91639930fba628f13a4d8d0e261c4 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Sat, 24 Sep 2005 17:22:52 +0000
Subject: 	* compat.h: 	- Allow tda1004x & lgdt330x support in
 tree-merge for all kernels.

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>
---
 v4l/compat.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'v4l/compat.h')

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
 /*
-- 
cgit v1.2.3