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/sni | |
| parent | dca50cc150304946afb790f00ead222736146e3e (diff) | |
Make the default configurations (RM200C / Acer PICA) compile.
Diffstat (limited to 'arch/mips/sni')
| -rw-r--r-- | arch/mips/sni/int-handler.S | 6 | ||||
| -rw-r--r-- | arch/mips/sni/pci.c | 10 | ||||
| -rw-r--r-- | arch/mips/sni/setup.c | 7 |
3 files changed, 9 insertions, 14 deletions
diff --git a/arch/mips/sni/int-handler.S b/arch/mips/sni/int-handler.S index b69c44bf8..3c920954d 100644 --- a/arch/mips/sni/int-handler.S +++ b/arch/mips/sni/int-handler.S @@ -1,9 +1,8 @@ -/* +/* $Id: int-handler.S,v 1.2 1997/12/01 17:57:40 ralf Exp $ + * * SNI RM200 PCI specific interrupt handler code. * * Copyright (C) 1994 - 1997 by Ralf Baechle - * - * $Id: int-handler.S,v 1.3 1997/12/01 16:39:24 ralf Exp $ */ #include <asm/asm.h> #include <linux/config.h> @@ -18,7 +17,6 @@ .align 5 NESTED(sni_rm200_pci_handle_int, PT_SIZE, sp) SAVE_ALL - REG_S sp,PT_OR2(sp) CLI .set at diff --git a/arch/mips/sni/pci.c b/arch/mips/sni/pci.c index 0e497450a..fe538d277 100644 --- a/arch/mips/sni/pci.c +++ b/arch/mips/sni/pci.c @@ -1,11 +1,12 @@ -/* +/* $Id: pci.c,v 1.5 1998/05/07 02:57:22 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. * * SNI specific PCI support for RM200/RM300. * - * $Id: pci.c,v 1.5 1998/05/04 01:15:23 ralf Exp $ + * Copyright (C) 1997, 1998 Ralf Baechle */ #include <linux/config.h> #include <linux/pci.h> @@ -25,8 +26,7 @@ do { \ (where & 0xfc); \ } while(0); -static unsigned long sni_rm200_pcibios_fixup (unsigned long memory_start, - unsigned long memory_end) +static void sni_rm200_pcibios_fixup (void) { /* * TODO: Fix PCI_INTERRUPT_LINE register for onboard cards. @@ -35,8 +35,6 @@ static unsigned long sni_rm200_pcibios_fixup (unsigned long memory_start, */ pcibios_write_config_byte(0, PCI_DEVFN(1, 0), PCI_INTERRUPT_LINE, PCIMT_IRQ_SCSI); - - return memory_start; } /* diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index d9fa7c8de..d2b0109e7 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c @@ -1,4 +1,5 @@ -/* +/* $Id: setup.c,v 1.6 1998/05/04 09:12:58 ralf Exp $ + * * Setup pointers to hardware dependant routines. * * This file is subject to the terms and conditions of the GNU General Public @@ -6,8 +7,6 @@ * for more details. * * Copyright (C) 1996, 1997, 1998 by Ralf Baechle - * - * $Id: setup.c,v 1.5 1998/03/17 22:07:43 ralf Exp $ */ #include <asm/ptrace.h> #include <linux/config.h> @@ -88,7 +87,7 @@ static inline void sni_pcimt_detect(void) char boardtype[80]; unsigned char csmsr; char *p = boardtype; - unsigned int asic, cacheconf; + unsigned int asic; csmsr = *(volatile unsigned char *)PCIMT_CSMSR; |