tuner: Do not alter i2c_client.name

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

diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 5d681fa8bcb18d80504bb92d1bd58fbd90aabbff..51b1461d8fb62707f48482a59ee34cef55d85a50 100644 (file)
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -28,7 +28,6 @@
 #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>
@@ -58,11 +57,11 @@ struct i2c_info
        u8 hits;
 };
 
-static int i2c_count           = 0;
+static int i2c_count;
 static struct i2c_info i2cinfo[64];
 
 static int decoder             = PHILIPS2;
-static int standard            = 0;    /* 0 - auto 1 - ntsc 2 - pal 3 - secam */
+static int standard;   /* 0 - auto 1 - ntsc 2 - pal 3 - secam */
 
 /*
  *     I/O ports and Shared Memory
@@ -881,12 +880,14 @@ 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,
        .ioctl          = pms_ioctl,
+#ifdef CONFIG_COMPAT
        .compat_ioctl   = v4l_compat_ioctl32,
+#endif
        .read           = pms_read,
        .llseek         = no_llseek,
 };
@@ -896,7 +897,6 @@ static struct video_device pms_template=
        .owner          = THIS_MODULE,
        .name           = "Mediavision PMS",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_PMS,
        .fops           = &pms_fops,
 };