Merge branch 'linus' into pci-for-jesse

[linux-2.6-omap-h63xx.git] / drivers / parisc / eisa_eeprom.c

diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index e13aafa70bf528d0401770c88b3bce7815f4e35f..5ac207932fd7b755fa56418ec8745be6c9afd093 100644 (file)
--- a/drivers/parisc/eisa_eeprom.c
+++ b/drivers/parisc/eisa_eeprom.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -83,6 +84,8 @@ static int eisa_eeprom_ioctl(struct inode *inode, struct file *file,
 
 static int eisa_eeprom_open(struct inode *inode, struct file *file)
 {
+       cycle_kernel_lock();
+
        if (file->f_mode & 2)
                return -EINVAL;
    
@@ -97,7 +100,7 @@ static int eisa_eeprom_release(struct inode *inode, struct file *file)
 /*
  *     The various file operations we support.
  */
-static struct file_operations eisa_eeprom_fops = {
+static const struct file_operations eisa_eeprom_fops = {
        .owner =        THIS_MODULE,
        .llseek =       eisa_eeprom_llseek,
        .read =         eisa_eeprom_read,