diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-08-26 22:12:32 +0000 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-08-26 22:12:32 +0000 |
| commit | d187ceacd6c9b0bd3072b1f4e05794dd7e718f21 (patch) | |
| tree | 1eb5c7f1368f24418ae551698b063b847e3a4744 /include/asm-mips | |
| parent | ee2fdfe8320151e5a73cd1d6b9ef9cb381662089 (diff) | |
put back changes removed by merge:-(
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/jazz.h | 3 | ||||
| -rw-r--r-- | include/asm-mips/keyboard.h | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/asm-mips/jazz.h b/include/asm-mips/jazz.h index f57cf7b95..186929f36 100644 --- a/include/asm-mips/jazz.h +++ b/include/asm-mips/jazz.h @@ -1,4 +1,4 @@ -/* $Id: jazz.h,v 1.6 1998/08/18 20:46:39 ralf Exp $ +/* $Id: jazz.h,v 1.7 1998/08/25 09:21:56 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -208,6 +208,7 @@ typedef struct { #define JAZZ_SERIAL1_IRQ 18 #define JAZZ_SERIAL2_IRQ 19 #define JAZZ_PARALLEL_IRQ 20 +#define JAZZ_MOUSE_IRQ 21 /* * JAZZ DMA Channels diff --git a/include/asm-mips/keyboard.h b/include/asm-mips/keyboard.h index 6b393c032..6923af793 100644 --- a/include/asm-mips/keyboard.h +++ b/include/asm-mips/keyboard.h @@ -5,7 +5,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * $Id: keyboard.h,v 1.8 1998/07/13 23:27:07 tsbogend Exp $ + * $Id: keyboard.h,v 1.9 1998/08/25 09:21:57 ralf Exp $ */ #ifndef __ASM_MIPS_KEYBOARD_H #define __ASM_MIPS_KEYBOARD_H @@ -54,9 +54,11 @@ void (*keyboard_setup)(void); /* Not true for Jazz machines, we cheat a bit for 'em. */ #define KEYBOARD_IRQ 1 -/* - * No PS/2 style mouse support for Jazz machines - */ +extern int jazz_ps2_request_irq(void); +extern void jazz_ps2_free_irq(void); + +#define ps2_request_irq() jazz_ps2_request_irq() +#define ps2_free_irq(inode) jazz_ps2_free_irq() #endif /* CONFIG_MIPS_JAZZ */ |