Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / powerpc / platforms / powermac / low_i2c.c

diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 8677f50..c896ce8 100644 (file)
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -30,6 +30,7 @@
 #undef DEBUG
 #undef DEBUG_LOW
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/init.h>
@@ -522,11 +523,10 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
                host->speed = KW_I2C_MODE_25KHZ;
                break;
        }       
-       host->irq = irq_of_parse_and_map(np, 0);
-       if (host->irq == NO_IRQ)
-               printk(KERN_WARNING
-                      "low_i2c: Failed to map interrupt for %s\n",
-                      np->full_name);
+       if (np->n_intrs > 0)
+               host->irq = np->intrs[0].line;
+       else
+               host->irq = NO_IRQ;
 
        host->base = ioremap((*addrp), 0x1000);
        if (host->base == NULL) {