X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmacintosh%2Fmacio-adb.c;h=314fc0830d9004d4a32998e6bb563c5719357822;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=4b08852c35eecc24cfde1153f113edfc90ed0547;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 4b08852c3..314fc0830 100644
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -90,12 +90,22 @@ int macio_init(void)
 {
 	struct device_node *adbs;
 	struct resource r;
-	unsigned int irq;
 
 	adbs = find_compatible_devices("adb", "chrp,adb0");
 	if (adbs == 0)
 		return -ENXIO;
 
+#if 0
+	{ int i = 0;
+
+	printk("macio_adb_init: node = %p, addrs =", adbs->node);
+	while(!of_address_to_resource(adbs, i, &r))
+		printk(" %x(%x)", r.start, r.end - r.start);
+	printk(", intrs =");
+	for (i = 0; i < adbs->n_intrs; ++i)
+		printk(" %x", adbs->intrs[i].line);
+	printk("\n"); }
+#endif
 	if (of_address_to_resource(adbs, 0, &r))
 		return -ENXIO;
 	adb = ioremap(r.start, sizeof(struct adb_regs));
@@ -107,9 +117,10 @@ int macio_init(void)
 	out_8(&adb->active_lo.r, 0xff);
 	out_8(&adb->autopoll.r, APE);
 
-	irq = irq_of_parse_and_map(adbs, 0);
-	if (request_irq(irq, macio_adb_interrupt, 0, "ADB", (void *)0)) {
-		printk(KERN_ERR "ADB: can't get irq %d\n", irq);
+	if (request_irq(adbs->intrs[0].line, macio_adb_interrupt,
+			0, "ADB", (void *)0)) {
+		printk(KERN_ERR "ADB: can't get irq %d\n",
+		       adbs->intrs[0].line);
 		return -EAGAIN;
 	}
 	out_8(&adb->intr_enb.r, DFB | TAG);