diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-10 22:49:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-10 22:49:54 +0000 |
| commit | 38114d5d33cfc8b81f3d9dda27a6b7a9f2e539c2 (patch) | |
| tree | 0bb50d50312dea4b01371cfbfa481269c886916c /include | |
| parent | 08b0be66ff8bc4be230c2f4bc017d30d73228a7f (diff) | |
Kill irq_cannonicalize.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/irq.h | 16 | ||||
| -rw-r--r-- | include/asm-mips64/irq.h | 19 |
2 files changed, 26 insertions, 9 deletions
diff --git a/include/asm-mips/irq.h b/include/asm-mips/irq.h index c7bafd3c8..c42b3b815 100644 --- a/include/asm-mips/irq.h +++ b/include/asm-mips/irq.h @@ -1,20 +1,28 @@ -/* $Id: irq.h,v 1.6 2000/01/26 00:07:45 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 * for more details. * * Copyright (C) 1994 by Waldorf GMBH, written by Ralf Baechle - * Copyright (C) 1995, 1996, 1997, 1998 by Ralf Baechle + * Copyright (C) 1995, 96, 97, 98, 99, 2000 by Ralf Baechle */ #ifndef _ASM_IRQ_H #define _ASM_IRQ_H +#include <linux/config.h> + #define NR_IRQS 64 #define TIMER_IRQ 0 -extern int (*irq_cannonicalize)(int irq); +#ifdef CONFIG_I8259 +static inline int irq_cannonicalize(int irq) +{ + return ((irq == 2) ? 9 : irq); +} +#else +#define irq_cannonicalize(irq) (irq) /* Sane hardware, sane code ... */ +#endif struct irqaction; extern int i8259_setup_irq(int irq, struct irqaction * new); diff --git a/include/asm-mips64/irq.h b/include/asm-mips64/irq.h index 031955635..719667e0f 100644 --- a/include/asm-mips64/irq.h +++ b/include/asm-mips64/irq.h @@ -1,21 +1,30 @@ -/* $Id$ - * +/* * 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 * for more details. * * Copyright (C) 1994 by Waldorf GMBH, written by Ralf Baechle - * Copyright (C) 1995 - 1999 by Ralf Baechle - * Copyright (C) 1999 Silicon Graphics, Inc. + * Copyright (C) 1995, 96, 97, 98, 1999, 2000 by Ralf Baechle + * Copyright (C) 1999, 2000 Silicon Graphics, Inc. */ #ifndef _ASM_IRQ_H #define _ASM_IRQ_H +#include <linux/config.h> + #define NR_IRQS 256 #define TIMER_IRQ 0 -extern int (*irq_cannonicalize)(int irq); +#ifdef CONFIG_I8259 +static inline int irq_cannonicalize(int irq) +{ + return ((irq == 2) ? 9 : irq); +} +#else +#define irq_cannonicalize(irq) (irq) /* Sane hardware, sane code ... */ +#endif + struct irqaction; extern int i8259_setup_irq(int irq, struct irqaction * new); |