Merge git://git.infradead.org/mtd-2.6

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

diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index c3a51d1fae5de6df86a7270f44540e3cabd07fcb..3279a1b6501d6b2f5c108ecfbc73c91bd293f0f6 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>
 
@@ -121,7 +122,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        __u8 ireg = 0;
        int error = 0;
 
-       if (D7S_MINOR != iminor(file->f_dentry->d_inode))
+       if (D7S_MINOR != iminor(file->f_path.dentry->d_inode))
                return -ENODEV;
 
        lock_kernel();
@@ -166,7 +167,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,
@@ -184,7 +185,7 @@ static int __init d7s_init(void)
 
        for_each_ebus(ebus) {
                for_each_ebusdev(edev, ebus) {
-                       if (!strcmp(edev->prom_name, D7S_OBPNAME))
+                       if (!strcmp(edev->prom_node->name, D7S_OBPNAME))
                                goto ebus_done;
                }
        }