diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
| commit | f1da2c3860e301527d56a1ef0b56c649ee7c4b1b (patch) | |
| tree | 562b5d2e8b9cb62eb983d78ff6bcf9789e08fcf6 /arch/sparc/kernel/sparc_ksyms.c | |
| parent | 00f11569ac8ca73cbcdef8822de1583e79aee571 (diff) | |
Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.
The IP22 cache bugs which are plaguing some machines are still unfixed.
Diffstat (limited to 'arch/sparc/kernel/sparc_ksyms.c')
| -rw-r--r-- | arch/sparc/kernel/sparc_ksyms.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index 4d1a8db1c..a51995713 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c @@ -1,4 +1,4 @@ -/* $Id: sparc_ksyms.c,v 1.100 2000/07/07 07:49:08 anton Exp $ +/* $Id: sparc_ksyms.c,v 1.101 2000/07/12 00:25:32 anton Exp $ * arch/sparc/kernel/ksyms.c: Sparc specific ksyms support. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -19,6 +19,9 @@ #include <linux/in6.h> #include <linux/spinlock.h> #include <linux/mm.h> +#ifdef CONFIG_PCI +#include <linux/pci.h> +#endif #include <asm/oplib.h> #include <asm/delay.h> @@ -42,9 +45,6 @@ #include <asm/sbus.h> #include <asm/dma.h> #endif -#ifdef CONFIG_PCI -#include <asm/pci.h> -#endif #include <asm/a.out.h> #include <asm/io-unit.h> |