[PATCH] v4l: 809: some changes to allow compiling cx88 and saa7134

- Some changes to allow compiling cx88 and saa7134 without V4L1 support.
- This patch will help obsoleting V4L1 API.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 13 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index f22ccb65de1c..cedd1d79ac13 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -34,6 +34,9 @@
 
 #include "cx88.h"
 
+/* Include V4L1 specific functions. Should be removed soon */
+#include <linux/videodev.h>
+
 MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
@@ -1187,7 +1190,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 struct v4l2_format *f = arg;
                 return cx8800_try_fmt(dev,fh,f);
         }
-
+#ifdef HAVE_V4L1
         /* --- streaming capture ------------------------------------- */
         case VIDIOCGMBUF:
         {
@@ -1213,6 +1216,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 }
                 return 0;
         }
+#endif
         case VIDIOC_REQBUFS:
                 return videobuf_reqbufs(get_queue(fh), arg);
 
@@ -1244,7 +1248,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 res_free(dev,fh,res);
                 return 0;
         }
-
         default:
                 return cx88_do_ioctl( inode, file, fh->radio, core, cmd, arg, video_do_ioctl );
         }
@@ -1537,6 +1540,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                 *id = 0;
                 return 0;
         }
+#ifdef HAVE_V4L1
         case VIDIOCSTUNER:
         {
                 struct video_tuner *v = arg;
@@ -1547,6 +1551,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                 cx88_call_i2c_clients(core,VIDIOCSTUNER,v);
                 return 0;
         }
+#endif
         case VIDIOC_S_TUNER:
         {
                 struct v4l2_tuner *t = arg;
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index caeb47c68b8b..632ebe8724ec 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -30,6 +30,9 @@
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
+/* Include V4L1 specific functions. Should be removed soon */
+#include <linux/videodev.h>
+
 /* ------------------------------------------------------------------ */
 
 static unsigned int video_debug   = 0;
@@ -2060,7 +2063,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 struct v4l2_format *f = arg;
                 return saa7134_try_fmt(dev,fh,f);
         }
-
+#ifdef HAVE_V4L1
         case VIDIOCGMBUF:
         {
                 struct video_mbuf *mbuf = arg;
@@ -2085,6 +2088,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 }
                 return 0;
         }
+#endif
         case VIDIOC_REQBUFS:
                 return videobuf_reqbufs(saa7134_queue(fh),arg);
 
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 064c2f7a8c12..cd28a6a7b972 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -24,7 +24,7 @@
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/kdev_t.h>
 #include <linux/input.h>
 #include <linux/notifier.h>