diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1997-12-29 00:06:49 +0000 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1997-12-29 00:06:49 +0000 |
| commit | 7daf415a75c4b991fd1708b222d624fab9886011 (patch) | |
| tree | e17dd3cdd620e7d8a9941baa736aacfee55ee2ed | |
| parent | 3939f660208cebe8656ec1c3ad57d44277de2fae (diff) | |
fixed bugs introduced once again by Ralfs merges:-(
| -rw-r--r-- | arch/mips/jazz/hw-access.c | 3 | ||||
| -rw-r--r-- | arch/mips/jazz/int-handler.S | 4 | ||||
| -rw-r--r-- | arch/mips/jazz/setup.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/arch/mips/jazz/hw-access.c b/arch/mips/jazz/hw-access.c index 2ed460ee1..73122bcc7 100644 --- a/arch/mips/jazz/hw-access.c +++ b/arch/mips/jazz/hw-access.c @@ -7,7 +7,7 @@ * * Copyright (C) 1995, 1996, 1997 by Ralf Baechle * - * $Id: hw-access.c,v 1.4 1997/07/29 17:46:45 ralf Exp $ + * $Id: hw-access.c,v 1.4 1997/12/01 17:57:23 ralf Exp $ */ #include <linux/delay.h> #include <linux/linkage.h> @@ -180,4 +180,5 @@ void jazz_keyboard_setup(void) kbd_write_command = jazz_write_command; kbd_read_status = jazz_read_status; request_region(0x60, 16, "keyboard"); + r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, r4030_read_reg16(JAZZ_IO_IRQ_ENABLE) | JAZZ_IE_KEYBOARD); } diff --git a/arch/mips/jazz/int-handler.S b/arch/mips/jazz/int-handler.S index 4c233ef54..97a47f8c5 100644 --- a/arch/mips/jazz/int-handler.S +++ b/arch/mips/jazz/int-handler.S @@ -10,7 +10,7 @@ * Squeeze the last cycles out of the handlers. Only a dead * cycle is a good cycle. * - * $Id: int-handler.S,v 1.3 1997/09/20 19:20:11 root Exp $ + * $Id: int-handler.S,v 1.5 1997/12/01 17:57:23 ralf Exp $ */ #include <asm/asm.h> #include <asm/mipsconfig.h> @@ -263,7 +263,7 @@ loc_ethernet: li s1,~JAZZ_IE_ETHERNET b loc_call loc_scsi: li s1,~JAZZ_IE_SCSI - li a0,12 # JAZZ_SCSI_IRQ + li a0,JAZZ_SCSI_IRQ b loc_call /* diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index b31db6c95..d6ca9c516 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c @@ -7,12 +7,13 @@ * * Copyright (C) 1996, 1997 by Ralf Baechle * - * $Id: setup.c,v 1.5 1997/12/01 17:57:24 ralf Exp $ + * $Id: setup.c,v 1.6 1997/12/02 03:43:43 ralf Exp $ */ #include <linux/init.h> #include <linux/ioport.h> #include <linux/sched.h> #include <linux/interrupt.h> +#include <linux/mm.h> #include <asm/bootinfo.h> #include <asm/keyboard.h> #include <asm/irq.h> @@ -21,6 +22,7 @@ #include <asm/reboot.h> #include <asm/vector.h> #include <asm/io.h> +#include <asm/pgtable.h> /* * Initial irq handlers. |