From dcec8a13bf565e47942a1751a9cec21bec5648fe Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 7 May 1998 02:55:41 +0000
Subject:  o Merge with Linux 2.1.99.  o Fix ancient bug in the ELF loader
 making ldd crash.  o Fix ancient bug in the keyboard code for SGI, SNI and
 Jazz.

---
 drivers/macintosh/macio-adb.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'drivers/macintosh/macio-adb.c')

diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 65048b0da..a826daea6 100644
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -10,6 +10,7 @@
 #include <asm/prom.h>
 #include <asm/adb.h>
 #include <asm/io.h>
+#include <asm/pgtable.h>
 #include <asm/hydra.h>
 #include <asm/irq.h>
 #include <asm/system.h>
@@ -71,7 +72,7 @@ void macio_adb_init(void)
 	if (adbs == 0)
 		return;
 
-#if 1
+#if 0
 	{ int i;
 
 	printk("macio_adb_init: node = %p, addrs =", adbs->node);
@@ -79,16 +80,17 @@ void macio_adb_init(void)
 		printk(" %x(%x)", adbs->addrs[i].address, adbs->addrs[i].size);
 	printk(", intrs =");
 	for (i = 0; i < adbs->n_intrs; ++i)
-		printk(" %x", adbs->intrs[i]);
+		printk(" %x", adbs->intrs[i].line);
 	printk("\n"); }
 #endif
 	
-	adb = (volatile struct adb_regs *) adbs->addrs->address;
+	adb = (volatile struct adb_regs *)
+		ioremap(adbs->addrs->address, sizeof(struct adb_regs));
 
-	if (request_irq(openpic_to_irq(adbs->intrs[0]), macio_adb_interrupt,
+	if (request_irq(adbs->intrs[0].line, macio_adb_interrupt,
 			0, "ADB", (void *)0)) {
 		printk(KERN_ERR "ADB: can't get irq %d\n",
-		       openpic_to_irq(adbs->intrs[0]));
+		       adbs->intrs[0].line);
 		return;
 	}
 
-- 
cgit v1.2.3