Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / sbus / char / rtc.c

diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c
index 5774bdd0e26faaa2e70ba1362978251fac2f19ca..18d18f1a114ec9cdf8d4443bb236d0cb9b8e0208 100644 (file)
--- a/drivers/sbus/char/rtc.c
+++ b/drivers/sbus/char/rtc.c
@@ -19,7 +19,6 @@
 #include <linux/fcntl.h>
 #include <linux/poll.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <asm/io.h>
 #include <asm/mostek.h>
 #include <asm/system.h>
@@ -210,27 +209,6 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
        }
 }
 
-static long rtc_compat_ioctl(struct file *file, unsigned int cmd,
-       unsigned long arg)
-{
-       int rval = -ENOIOCTLCMD;
-
-       switch (cmd) {
-       /*
-        * These two are specific to this driver, the generic rtc ioctls
-        * are hanlded elsewhere.
-        */
-       case RTCGET:
-       case RTCSET:
-               lock_kernel();
-               rval = rtc_ioctl(file->f_dentry->d_inode, file, cmd, arg);
-               unlock_kernel();
-               break;
-       }
-
-       return rval;
-}
-
 static int rtc_open(struct inode *inode, struct file *file)
 {
        int ret;
@@ -254,11 +232,10 @@ static int rtc_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static struct file_operations rtc_fops = {
+static const struct file_operations rtc_fops = {
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
        .ioctl =        rtc_ioctl,
-       .compat_ioctl = rtc_compat_ioctl,
        .open =         rtc_open,
        .release =      rtc_release,
 };