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/sparc/kernel/pcic.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'arch/sparc/kernel/pcic.c')
| -rw-r--r-- | arch/sparc/kernel/pcic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index a4ae9497e..461773e96 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c @@ -20,7 +20,6 @@ #include <asm/ebus.h> #include <asm/sbus.h> /* for sanity check... */ #include <asm/swift.h> /* for cache flushing. */ - #include <asm/io.h> #undef PROM_DEBUG @@ -39,7 +38,6 @@ #include <linux/timex.h> #include <linux/interrupt.h> -#include <asm/io.h> #include <asm/irq.h> #include <asm/oplib.h> #include <asm/pcic.h> |