From c2d841f465a26e84edd2e2ff833d3b096110decc Mon Sep 17 00:00:00 2001
From: Holger Waechtler <devnull@localhost>
Date: Fri, 21 Mar 2003 10:31:01 +0000
Subject:  - include "compat.h" always, we definitely need this trashcan...  -
 replaced uint32_t and friends by u32 & co., for now only in frontend.h -    
 everything else will take us in hell when we start to port this driver...

---
 linux/drivers/media/dvb/dvb-core/compat.h       | 1 +
 linux/drivers/media/dvb/dvb-core/dmxdev.c       | 4 +---
 linux/drivers/media/dvb/dvb-core/dvb_demux.c    | 7 +------
 linux/drivers/media/dvb/dvb-core/dvb_frontend.c | 6 +++++-
 linux/drivers/media/dvb/dvb-core/dvb_i2c.c      | 8 ++++----
 linux/drivers/media/dvb/dvb-core/dvb_net.c      | 6 +++---
 linux/drivers/media/dvb/dvb-core/dvbdev.c       | 6 +-----
 linux/drivers/media/dvb/dvb-core/dvbdev.h       | 1 +
 8 files changed, 17 insertions(+), 22 deletions(-)

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

diff --git a/linux/drivers/media/dvb/dvb-core/compat.h b/linux/drivers/media/dvb/dvb-core/compat.h
index 35471c721..92ba960a0 100644
--- a/linux/drivers/media/dvb/dvb-core/compat.h
+++ b/linux/drivers/media/dvb/dvb-core/compat.h
@@ -3,6 +3,7 @@
 
 #include <asm/uaccess.h>
 #include <linux/version.h>
+#include <linux/fs.h>
 
 /**
  *  compatibility crap for old kernels. No guarantee for a working driver
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index aa9612cea..56fd12ca4 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -27,10 +27,8 @@
 #include <asm/uaccess.h>
 
 #include "dmxdev.h"
+#include "compat.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#include "compat.h"
-#endif
 
 //MODULE_DESCRIPTION("");
 //MODULE_AUTHOR("Ralph Metzler, Marcus Metzler");
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
index f52a408fe..a7e67c8e9 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -27,13 +27,8 @@
 #include <linux/version.h>
 #include <asm/uaccess.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#include "compat.h"
-#else
-	#include <linux/crc32.h>
-#endif
-
 #include "dvb_demux.h"
+#include "compat.h"
 
 #define NOBUFS  
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index 34a337bf3..6049dbf44 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -22,12 +22,16 @@
  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
  */
 
+#include <asm/processor.h>
+#include <asm/semaphore.h>
+#include <asm/errno.h>
+#include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/wait.h>
 #include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/module.h>
-#include <linux/compatmac.h>
 #include <linux/list.h>
 
 #include "dvb_frontend.h"
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
index bc1bdcbac..680e0aa9c 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
@@ -19,16 +19,16 @@
  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
  */
 
+#include <asm/semaphore.h>
+#include <asm/errno.h>
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#include "compat.h"
-#endif
-
 #include "dvb_i2c.h"
+#include "compat.h"
+
 
 struct dvb_i2c_device {
 	struct list_head list_head;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index 30bc41dba..f1059425b 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -27,12 +27,12 @@
 #include <asm/uaccess.h>
 
 #include <linux/dvb/net.h>
+
 #include "dvb_demux.h"
 #include "dvb_net.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#include "compat.h"
-#endif
+#include "compat.h"
+
 
 #define DVB_NET_MULTICAST_MAX 10
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index 71929aafb..267bc1fa4 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -21,8 +21,6 @@
  *
  */
 
-/*#define CONFIG_DVB_DEVFS_ONLY 1*/
-
 #include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
@@ -39,10 +37,8 @@
 #include <linux/slab.h>
 
 #include "dvbdev.h"
+#include "compat.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#include "compat.h"
-#endif
 
 static int dvbdev_debug = 0;
 #define dprintk if (dvbdev_debug) printk
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.h b/linux/drivers/media/dvb/dvb-core/dvbdev.h
index f472ed178..d374e4e0e 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.h
@@ -27,6 +27,7 @@
 #include <linux/types.h>
 #include <linux/version.h>
 #include <linux/poll.h>
+#include <linux/fs.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/list.h>
 
-- 
cgit v1.2.3