linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / sbus / char / cpwatchdog.c

diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 836a58b..fd2cc77 100644 (file)
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -301,11 +301,11 @@ static int wd_open(struct inode *inode, struct file *f)
        {       
                if (request_irq(wd_dev.irq, 
                                                &wd_interrupt, 
-                                               IRQF_SHARED,
+                                               SA_SHIRQ,
                                                WD_OBPNAME,
                                                (void *)wd_dev.regs)) {
-                       printk("%s: Cannot register IRQ %d\n", 
-                               WD_OBPNAME, wd_dev.irq);
+                       printk("%s: Cannot register IRQ %s\n", 
+                               WD_OBPNAME, __irq_itoa(wd_dev.irq));
                        return(-EBUSY);
                }
                wd_dev.initialized = 1;
@@ -755,7 +755,7 @@ static int __init wd_init(void)
 
        for_each_ebus(ebus) {
                for_each_ebusdev(edev, ebus) {
-                       if (!strcmp(edev->ofdev.node->name, WD_OBPNAME))
+                       if (!strcmp(edev->prom_name, WD_OBPNAME))
                                goto ebus_done;
                }
        }