diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /drivers/macintosh/macio-adb.c | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
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.
Diffstat (limited to 'drivers/macintosh/macio-adb.c')
| -rw-r--r-- | drivers/macintosh/macio-adb.c | 12 |
1 files changed, 7 insertions, 5 deletions
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; } |