diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/mips/sgi/kernel/indy_int.c | |
parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) |
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/sgi/kernel/indy_int.c')
-rw-r--r-- | arch/mips/sgi/kernel/indy_int.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/sgi/kernel/indy_int.c b/arch/mips/sgi/kernel/indy_int.c index b29ff58c9..60ce3e0f1 100644 --- a/arch/mips/sgi/kernel/indy_int.c +++ b/arch/mips/sgi/kernel/indy_int.c @@ -1,4 +1,4 @@ -/* $Id: indy_int.c,v 1.12 1999/05/07 22:34:32 ulfc Exp $ +/* $Id: indy_int.c,v 1.13 1999/06/12 17:26:15 ulfc Exp $ * * indy_int.c: Routines for generic manipulation of the INT[23] ASIC * found on INDY workstations.. @@ -424,7 +424,7 @@ static int indy_irq_cannonicalize(int irq) return irq; /* Sane hardware, sane code ... */ } -__initfunc(void init_IRQ(void)) +void __init init_IRQ(void) { irq_cannonicalize = indy_irq_cannonicalize; irq_setup(); @@ -529,7 +529,7 @@ int probe_irq_off (unsigned long irqs) return 0; } -__initfunc(void sgint_init(void)) +void __init sgint_init(void) { int i; |