From e243c3d8dd6651711af480c436fc78a347b5e68e Mon Sep 17 00:00:00 2001
From: Michael Hunold <devnull@localhost>
Date: Tue, 14 Oct 2003 08:11:03 +0000
Subject: Include 2.6 kernel janitor cleanups (eliminate #include duplication,
 shift includes around) -- I don't care much about this...

---
 linux/drivers/media/dvb/dvb-core/dvb_functions.c | 1 -
 linux/drivers/media/dvb/dvb-core/dvb_functions.h | 4 +---
 linux/drivers/media/dvb/dvb-core/dvbdev.h        | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'linux/drivers/media/dvb/dvb-core')

diff --git a/linux/drivers/media/dvb/dvb-core/dvb_functions.c b/linux/drivers/media/dvb/dvb-core/dvb_functions.c
index 369889199..e2495d1c8 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_functions.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_functions.c
@@ -1,4 +1,3 @@
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/string.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_functions.h b/linux/drivers/media/dvb/dvb-core/dvb_functions.h
index fd04c07d1..f80870532 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_functions.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_functions.h
@@ -24,8 +24,6 @@
 #ifndef __DVB_FUNCTIONS_H__
 #define __DVB_FUNCTIONS_H__
 
-#include <linux/version.h>
-
 /**
  *  a sleeping delay function, waits i ms
  *
@@ -48,7 +46,7 @@ extern int dvb_usercopy(struct inode *inode, struct file *file,
 
 extern void dvb_kernel_thread_setup (const char *thread_name);
 
-
+#include <linux/version.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 #include "dvb_compat.h"
 #endif
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.h b/linux/drivers/media/dvb/dvb-core/dvbdev.h
index bf0f98bda..22e20f340 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.h
@@ -27,7 +27,6 @@
 #include <linux/poll.h>
 #include <linux/fs.h>
 #include <linux/list.h>
-#include <linux/version.h>
 #include <linux/devfs_fs_kernel.h>
 
 #define DVB_MAJOR 250
@@ -45,6 +44,7 @@
 
 struct dvb_adapter {
 	int num;
+#include <linux/version.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 	devfs_handle_t devfs_handle;
 #endif
-- 
cgit v1.2.3