Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[linux-2.6] / drivers / sbus / char / display7seg.c

diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index a4909e0c7f83877d435869735fa8ecffd30d3808..d8f5c0ca236d7f21b14a21a9b73e1b4483d3984b 100644 (file)
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -20,6 +20,7 @@
 #include <asm/ebus.h>                  /* EBus device                                  */
 #include <asm/oplib.h>                 /* OpenProm Library                     */
 #include <asm/uaccess.h>               /* put_/get_user                        */
+#include <asm/io.h>
 
 #include <asm/display7seg.h>
 
@@ -93,6 +94,7 @@ static int d7s_open(struct inode *inode, struct file *f)
 {
        if (D7S_MINOR != iminor(inode))
                return -ENODEV;
+       cycle_kernel_lock();
        atomic_inc(&d7s_users);
        return 0;
 }
@@ -166,7 +168,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        return error;
 }
 
-static struct file_operations d7s_fops = {
+static const struct file_operations d7s_fops = {
        .owner =                THIS_MODULE,
        .unlocked_ioctl =       d7s_ioctl,
        .compat_ioctl =         d7s_ioctl,