From dcec8a13bf565e47942a1751a9cec21bec5648fe Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 7 May 1998 02:55:41 +0000 Subject: 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. --- include/asm-sparc/io.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/asm-sparc/io.h') 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: -- cgit v1.2.3