Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

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

diff --git a/drivers/sbus/char/riowatchdog.c b/drivers/sbus/char/riowatchdog.c
index 9325cf7..2a9cc82 100644 (file)
--- a/drivers/sbus/char/riowatchdog.c
+++ b/drivers/sbus/char/riowatchdog.c
@@ -52,7 +52,7 @@ MODULE_LICENSE("GPL");
 #define RIOWD_NAME     "pmc"
 #define RIOWD_MINOR    215
 
-static spinlock_t riowd_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(riowd_lock);
 
 static void __iomem *bbc_regs;
 static void __iomem *riowd_regs;
@@ -211,7 +211,7 @@ static int __init riowd_bbc_init(void)
 
        for_each_ebus(ebus) {
                for_each_ebusdev(edev, ebus) {
-                       if (!strcmp(edev->prom_name, "bbc"))
+                       if (!strcmp(edev->ofdev.node->name, "bbc"))
                                goto found_bbc;
                }
        }
@@ -238,7 +238,7 @@ static int __init riowd_init(void)
 
        for_each_ebus(ebus) {
                for_each_ebusdev(edev, ebus) {
-                       if (!strcmp(edev->prom_name, RIOWD_NAME))
+                       if (!strcmp(edev->ofdev.node->name, RIOWD_NAME))
                                goto ebus_done;
                }
        }