3 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_functions.h b/linux/drivers/media/dvb/dvb-core/dvb_functions.h
index 6e67b684c..9bb8053d2 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_functions.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_functions.h
@@ -1,6 +1,8 @@
 #ifndef __DVB_FUNCTIONS_H__
 #define __DVB_FUNCTIONS_H__
 
+#include <linux/version.h>
+
 /**
  *  a sleeping delay function, waits i ms
  *
@@ -23,7 +25,9 @@ extern int dvb_usercopy(struct inode *inode, struct file *file,
 
 extern void dvb_kernel_thread_setup (const char *thread_name);
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 #include "dvb_compat.h"
+#endif
 
 #endif
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index 1963ac731..7b77d4862 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -30,7 +30,6 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/version.h>
 
 #include "dvbdev.h"
 #include "dvb_functions.h"
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.h b/linux/drivers/media/dvb/dvb-core/dvbdev.h
index 80091914e..967bdadf1 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.h
@@ -28,9 +28,8 @@
 #include <linux/poll.h>
 #include <linux/fs.h>
 #include <linux/list.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-	#include <linux/devfs_fs_kernel.h>
-#endif
+#include <linux/version.h>
+#include <linux/devfs_fs_kernel.h>
 
 #define DVB_MAJOR 250