V4L/DVB (6885): Add support for the Hauppauge HVR1500Q

[linux-2.6-omap-h63xx.git] / drivers / media / video / pms.c

diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 09835ca098b169b4226c1da8f030786776559e35..6820c2aabd303affccde30951bd018bc7f1d5673 100644 (file)
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -28,8 +28,8 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <asm/io.h>
-#include <linux/sched.h>
 #include <linux/videodev.h>
+#include <media/v4l2-common.h>
 #include <linux/mutex.h>
 
 #include <asm/uaccess.h>
@@ -804,7 +804,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
                        struct video_picture *p = arg;
                        if(!((p->palette==VIDEO_PALETTE_RGB565 && p->depth==16)
                            ||(p->palette==VIDEO_PALETTE_RGB555 && p->depth==15)))
-                               return -EINVAL;
+                               return -EINVAL;
                        pd->picture= *p;
 
                        /*
@@ -880,7 +880,7 @@ static ssize_t pms_read(struct file *file, char __user *buf,
        return len;
 }
 
-static struct file_operations pms_fops = {
+static const struct file_operations pms_fops = {
        .owner          = THIS_MODULE,
        .open           = video_exclusive_open,
        .release        = video_exclusive_release,
@@ -895,7 +895,6 @@ static struct video_device pms_template=
        .owner          = THIS_MODULE,
        .name           = "Mediavision PMS",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_PMS,
        .fops           = &pms_fops,
 };