Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6

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

diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index db11ab9e60da289e9073c792dce72415b4ca632c..00b97d97aeaa612275e7cab190a7823fbcf1a1da 100644 (file)
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1940,11 +1940,7 @@ zoran_set_input (struct zoran *zr,
  *   ioctl routine
  */
 
-static int
-zoran_do_ioctl (struct inode *inode,
-               struct file  *file,
-               unsigned int  cmd,
-               void         *arg)
+static int zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 {
        struct zoran_fh *fh = file->private_data;
        struct zoran *zr = fh->zr;
@@ -4201,7 +4197,7 @@ zoran_ioctl (struct inode *inode,
             unsigned int  cmd,
             unsigned long arg)
 {
-       return video_usercopy(inode, file, cmd, arg, zoran_do_ioctl);
+       return video_usercopy(file, cmd, arg, zoran_do_ioctl);
 }
 
 static unsigned int