use local include path, put all osd stuff into one place

2 files changed, 45 insertions, 39 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index dae63228b..a18e45f80 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -71,10 +71,11 @@
 
 #include <linux/dvb/frontend.h>
 
-#include "../dvb-core/dvb_i2c.h"
-#include "../dvb-core/dvb_frontend.h"
-#include "av7110.h"
+#include "dvb_i2c.h"
+#include "dvb_frontend.h"
+#include "compat.h"
 
+#include "av7110.h"
 #include "saa7146_core.h"
 #include "saa7146_v4l.h"
 #include "saa7146_defs.h"
@@ -1998,6 +1999,37 @@ OSD_DrawCommand(av7110_t *av7110, osd_cmd_t *dc)
                 return -EINVAL;
         }
 }
+
+
+static int 
+dvb_osd_ioctl(struct inode *inode, struct file *file,
+            unsigned int cmd, void *parg)
+{
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
+        av7110_t *av7110=(av7110_t *) dvbdev->priv;
+
+        if (cmd==OSD_SEND_CMD)
+                return OSD_DrawCommand(av7110, (osd_cmd_t *)parg);
+
+	return -EINVAL;
+}
+
+
+static struct file_operations dvb_osd_fops = {
+	.owner		= THIS_MODULE,
+	.ioctl		= dvb_generic_ioctl,
+	.open		= dvb_generic_open,
+	.release	= dvb_generic_release,
+};
+
+static struct dvb_device dvbdev_osd = {
+	.priv		= 0,
+	.users		= 1,
+	.writers	= 1,
+	.fops		= &dvb_osd_fops,
+	.kernel_ioctl	= dvb_osd_ioctl,
+};
+
 #endif /* CONFIG_DVB_AV7110_OSD */
 
 
@@ -4203,19 +4235,6 @@ dvb_audio_ioctl(struct inode *inode, struct file *file,
         return ret;
 }
 
-static int 
-dvb_osd_ioctl(struct inode *inode, struct file *file,
-            unsigned int cmd, void *parg)
-{
-	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-        av7110_t *av7110=(av7110_t *) dvbdev->priv;
-
-#ifdef CONFIG_DVB_AV7110_OSD
-        if (cmd==OSD_SEND_CMD)
-                return OSD_DrawCommand(av7110, (osd_cmd_t *)parg);
-#endif
-        return -EINVAL;
-}
 
 static int dvb_video_open(struct inode *inode, struct file *file)
 {
@@ -4322,21 +4341,6 @@ static struct dvb_device dvbdev_ca = {
 	.kernel_ioctl	= dvb_ca_ioctl,
 };
 
-static struct file_operations dvb_osd_fops = {
-	.owner		= THIS_MODULE,
-	.ioctl		= dvb_generic_ioctl,
-	.open		= dvb_generic_open,
-	.release	= dvb_generic_release,
-};
-
-static struct dvb_device dvbdev_osd = {
-	.priv		= 0,
-	.users		= 1,
-	.writers	= 1,
-	.fops		= &dvb_osd_fops,
-	.kernel_ioctl	= dvb_osd_ioctl,
-};
-
 
 static
 void av7110_before_after_tune (fe_status_t s, void *data)
@@ -4491,11 +4495,13 @@ dvb_register(av7110_t *av7110)
                                     &dvbdev_video, av7110, DVB_DEVICE_VIDEO);
                 dvb_register_device(av7110->dvb_adapter, &av7110->audio_dev,
                                     &dvbdev_audio, av7110, DVB_DEVICE_AUDIO);
-                dvb_register_device(av7110->dvb_adapter, &av7110->osd_dev,
-                                    &dvbdev_osd, av7110, DVB_DEVICE_OSD);
                 dvb_register_device(av7110->dvb_adapter, &av7110->ca_dev,  
                                     &dvbdev_ca, av7110, DVB_DEVICE_CA);
                 vid_register(av7110);
+#ifdef CONFIG_DVB_AV7110_OSD
+		dvb_register_device(av7110->dvb_adapter, &av7110->osd_dev,
+                                    &dvbdev_osd, av7110, DVB_DEVICE_OSD);
+#endif
 #ifdef USE_DVB_DSP
                 dvb->dsp_dev = dvb_register_dsp(dvb_audio_open, 
                                                 dvb_audio_release, 
diff --git a/linux/drivers/media/dvb/av7110/av7110.h b/linux/drivers/media/dvb/av7110/av7110.h
index a4e8acaf7..9d285e483 100644
--- a/linux/drivers/media/dvb/av7110/av7110.h
+++ b/linux/drivers/media/dvb/av7110/av7110.h
@@ -47,12 +47,12 @@
 #include <linux/dvb/osd.h>
 #include <linux/dvb/net.h>
 
-#include "../dvb-core/dvbdev.h"
-#include "../dvb-core/demux.h"
-#include "../dvb-core/dvb_demux.h"
-#include "../dvb-core/dmxdev.h"
-#include "../dvb-core/dvb_filter.h"
-#include "../dvb-core/dvb_net.h"
+#include "dvbdev.h"
+#include "demux.h"
+#include "dvb_demux.h"
+#include "dmxdev.h"
+#include "dvb_filter.h"
+#include "dvb_net.h"
 
 
 typedef enum BOOTSTATES