diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 23:43:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 23:43:58 +0000 |
| commit | eceef87159b136a4a21395112b888e232ea8df76 (patch) | |
| tree | 1d244ceb9d714c6175ec765388759cbb6e9f4e4e /arch/mips/kernel | |
| parent | dca50cc150304946afb790f00ead222736146e3e (diff) | |
Make the default configurations (RM200C / Acer PICA) compile.
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/irq.c | 15 | ||||
| -rw-r--r-- | arch/mips/kernel/pci.c | 14 |
2 files changed, 16 insertions, 13 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 9dcca6184..c2c018045 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c @@ -1,10 +1,13 @@ -/* +/* $Id: irq.c,v 1.10 1998/05/07 02:57:17 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. + * * Code to handle x86 style IRQs plus some generic interrupt stuff. * * Copyright (C) 1992 Linus Torvalds - * Copyright (C) 1994, 1995, 1996, 1997 Ralf Baechle - * - * $Id: irq.c,v 1.9 1998/03/22 23:27:12 ralf Exp $ + * Copyright (C) 1994, 1995, 1996, 1997, 1998 Ralf Baechle */ #include <linux/errno.h> #include <linux/init.h> @@ -312,13 +315,13 @@ int probe_irq_off (unsigned long irqs) int (*irq_cannonicalize)(int irq); -static int 8259a_irq_cannonicalize(int irq) +static int i8259a_irq_cannonicalize(int irq) { return ((irq == 2) ? 9 : irq); } __initfunc(void init_IRQ(void)) { - irq_cannonicalize = 8259a_irq_cannonicalize; + irq_cannonicalize = i8259a_irq_cannonicalize; irq_setup(); } diff --git a/arch/mips/kernel/pci.c b/arch/mips/kernel/pci.c index 71a57b73e..3b02ce3db 100644 --- a/arch/mips/kernel/pci.c +++ b/arch/mips/kernel/pci.c @@ -1,9 +1,12 @@ -/* +/* $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. * * MIPS implementation of PCI BIOS services for PCI support. + * + * Copyright (C) 1997, 1998 Ralf Baechle */ #include <linux/config.h> #include <linux/init.h> @@ -19,10 +22,8 @@ struct pci_ops *pci_ops; /* * BIOS32 replacement. */ -__initfunc(unsigned long pcibios_init(unsigned long memory_start, - unsigned long memory_end)) +__initfunc(void pcibios_init(void)) { - return memory_start; } /* @@ -39,10 +40,9 @@ int pcibios_present (void) * each PCI chipset configuration. We just run the hook to the machine * specific implementation. */ -unsigned long pcibios_fixup (unsigned long memory_start, - unsigned long memory_end) +void pcibios_fixup (void) { - return pci_ops->pcibios_fixup(memory_start, memory_end); + return pci_ops->pcibios_fixup(); } int pcibios_read_config_byte (unsigned char bus, unsigned char dev_fn, |