diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /include/asm-sparc/io.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'include/asm-sparc/io.h')
| -rw-r--r-- | include/asm-sparc/io.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h index b1fb5b30e..93e5fde77 100644 --- a/include/asm-sparc/io.h +++ b/include/asm-sparc/io.h @@ -1,4 +1,4 @@ -/* $Id: io.h,v 1.14 1997/04/10 05:13:22 davem Exp $ */ +/* $Id: io.h,v 1.15 1998/01/30 10:59:51 jj Exp $ */ #ifndef __SPARC_IO_H #define __SPARC_IO_H @@ -99,6 +99,7 @@ extern __inline__ void mapioaddr(unsigned long physaddr, unsigned long virt_addr { switch(sparc_cpu_model) { case sun4c: + case sun4: sun4c_mapioaddr(physaddr, virt_addr, bus, rdonly); break; case sun4m: @@ -122,6 +123,7 @@ extern __inline__ void unmapioaddr(unsigned long virt_addr) { switch(sparc_cpu_model) { case sun4c: + case sun4: sun4c_unmapioaddr(virt_addr); break; case sun4m: |