diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /arch/mips/kernel/irq.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'arch/mips/kernel/irq.c')
| -rw-r--r-- | arch/mips/kernel/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 1b99fa99f..b083e3686 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c @@ -1,4 +1,4 @@ -/* $Id: irq.c,v 1.14 1999/02/15 02:16:50 ralf Exp $ +/* $Id: irq.c,v 1.15 1999/02/25 21:50:49 tsbogend 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 @@ -356,7 +356,7 @@ static int i8259_irq_cannonicalize(int irq) return ((irq == 2) ? 9 : irq); } -__initfunc(static void i8259_init(void)) +static void __init i8259_init(void) { /* Init master interrupt controller */ outb(0x11, 0x20); /* Start init sequence */ @@ -376,7 +376,7 @@ __initfunc(static void i8259_init(void)) outb(cached_21, 0x21); } -__initfunc(void init_IRQ(void)) +void __init init_IRQ(void) { irq_cannonicalize = i8259_irq_cannonicalize; /* i8259_init(); */ |