8 files changed, 27 insertions, 21 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index 9abef670b..b5e8cea92 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -33,7 +33,7 @@
 #include <linux/wait.h>
 
 #include "dmxdev.h"
-#include "dvb_compat.h"
+#include "dvb_functions.h"
 
 MODULE_PARM(debug,"i");
 static int debug = 0;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_compat.h b/linux/drivers/media/dvb/dvb-core/dvb_compat.h
index cbbaee353..a777e7bdb 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_compat.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_compat.h
@@ -7,21 +7,11 @@
 #include <linux/version.h>
 #include <linux/fs.h>
 
+#include "dvb_functions.h"
+
 /* necessary dummy functions due to the > 2.5.67 kernel i2c changes */
 #define i2c_get_adapdata(adapter) (struct saa7146_dev*)adapter->data;
 
-/**
- *  a sleeping delay function, waits i ms
- *
- */
-static
-inline void ddelay(int i)
-{
-	current->state=TASK_INTERRUPTIBLE;
-	schedule_timeout((HZ*i)/1000);
-}
-
-
 static inline
 void kernel_thread_setup (const char *thread_name)
 {
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
index f7ff477fd..183d5f0c4 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -30,7 +30,7 @@
 #include <linux/string.h>
 
 #include "dvb_demux.h"
-#include "dvb_compat.h"
+#include "dvb_functions.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 98d15c9ed..a1542b8b8 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -36,7 +36,7 @@
 
 #include "dvb_frontend.h"
 #include "dvbdev.h"
-#include "dvb_compat.h"
+#include "dvb_functions.h"
 
 
 static int dvb_frontend_debug = 0;
@@ -196,7 +196,7 @@ void dvb_call_frontend_notifiers (struct dvb_frontend_data *fe,
 		fe->lost_sync_jiffies = jiffies;
 
 	if (((s ^ fe->status) & FE_HAS_LOCK) && (s & FE_HAS_LOCK))
-		ddelay (fe->info->notifier_delay);
+		dvb_delay (fe->info->notifier_delay);
 
 	fe->status = s;
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_functions.h b/linux/drivers/media/dvb/dvb-core/dvb_functions.h
new file mode 100644
index 000000000..f37bd8bad
--- /dev/null
+++ b/linux/drivers/media/dvb/dvb-core/dvb_functions.h
@@ -0,0 +1,18 @@
+#ifndef __DVB_FUNCTIONS_H__
+#define __DVB_FUNCTIONS_H__
+
+/**
+ *  a sleeping delay function, waits i ms
+ *
+ */
+static
+inline void dvb_delay(int i)
+{
+	current->state=TASK_INTERRUPTIBLE;
+	schedule_timeout((HZ*i)/1000);
+}
+
+#include "dvb_compat.h"
+
+#endif
+
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
index 9d9a9f3e9..c0d45e8bc 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
@@ -26,7 +26,7 @@
 #include <linux/module.h>
 
 #include "dvb_i2c.h"
-#include "dvb_compat.h"
+#include "dvb_functions.h"
 
 
 struct dvb_i2c_device {
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index a799c7cca..323613b0c 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -35,9 +35,7 @@
 
 #include "dvb_demux.h"
 #include "dvb_net.h"
-
-#include "dvb_compat.h"
-
+#include "dvb_functions.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 468eeb5c1..9ac944c3c 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -32,7 +32,7 @@
 #include <linux/slab.h>
 
 #include "dvbdev.h"
-#include "dvb_compat.h"
+#include "dvb_functions.h"
 
 
 static int dvbdev_debug = 0;