linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 7186235..1c8b612 100644 (file)
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -377,7 +377,7 @@ static int __init attach_one_i2c(struct linux_ebus_device *edev, int index)
        bp->waiting = 0;
        init_waitqueue_head(&bp->wq);
        if (request_irq(edev->irqs[0], bbc_i2c_interrupt,
-                       IRQF_SHARED, "bbc_i2c", bp))
+                       SA_SHIRQ, "bbc_i2c", bp))
                goto fail;
 
        bp->index = index;
@@ -423,7 +423,7 @@ static int __init bbc_present(void)
 
        for_each_ebus(ebus) {
                for_each_ebusdev(edev, ebus) {
-                       if (!strcmp(edev->prom_node->name, "bbc"))
+                       if (!strcmp(edev->prom_name, "bbc"))
                                return 1;
                }
        }
@@ -440,13 +440,12 @@ static int __init bbc_i2c_init(void)
        struct linux_ebus_device *edev = NULL;
        int err, index = 0;
 
-       if ((tlb_type != cheetah && tlb_type != cheetah_plus) ||
-           !bbc_present())
+       if (tlb_type != cheetah || !bbc_present())
                return -ENODEV;
 
        for_each_ebus(ebus) {
                for_each_ebusdev(edev, ebus) {
-                       if (!strcmp(edev->prom_node->name, "i2c")) {
+                       if (!strcmp(edev->prom_name, "i2c")) {
                                if (!attach_one_i2c(edev, index))
                                        index++;
                        }
@@ -487,4 +486,3 @@ static void bbc_i2c_cleanup(void)
 
 module_init(bbc_i2c_init);
 module_exit(bbc_i2c_cleanup);
-MODULE_LICENSE("GPL");