Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work

[sfrench/cifs-2.6.git] / drivers / sbus / char / display7seg.c

diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 2c86a4b809cd1c8482fcf15aee90e5b707730a9e..d92bc8827a9e0d3c7c68b8cef8ed8bce8c9b6acd 100644 (file)
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -119,7 +119,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        __u8 regs = readb(d7s_regs);
        __u8 ireg = 0;
-       int error = 0
+       int error = 0;
 
        if (D7S_MINOR != iminor(file->f_dentry->d_inode))
                return -ENODEV;
@@ -184,7 +184,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;
                }
        }