X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fsbus%2Fchar%2Fcpwatchdog.c;fp=drivers%2Fsbus%2Fchar%2Fcpwatchdog.c;h=fd2cc7782f7680bc8e786c39aa04690201244e09;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=836a58bb0305436a0ca30c35c74c80489620ee31;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 836a58bb0..fd2cc7782 100644
--- 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;
 		}
 	}