patch-2.1.9 linux/arch/sparc/kernel/auxio.c

Next file: linux/arch/sparc/kernel/cpu.c
Previous file: linux/arch/sparc/kernel/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.8/linux/arch/sparc/kernel/auxio.c linux/arch/sparc/kernel/auxio.c
@@ -5,6 +5,7 @@
 
 #include <asm/oplib.h>
 #include <asm/io.h>
+#include <asm/auxio.h>
 
 /* Probe and map in the Auxiliary I/O register */
 unsigned char *auxio_register;
@@ -15,6 +16,10 @@
 	int node, auxio_nd;
 	struct linux_prom_registers auxregs[1];
 
+	if (sparc_cpu_model == sun4d) {
+		auxio_register = 0;
+		return;
+	}
 	node = prom_getchild(prom_root_node);
 	auxio_nd = prom_searchsiblings(node, "auxiliary-io");
 	if(!auxio_nd) {
@@ -37,4 +42,6 @@
 	if((((unsigned long) auxregs[0].phys_addr) & 3) == 3 ||
 	   sparc_cpu_model == sun4c)
 		auxio_register = (unsigned char *) ((int)auxio_register | 3);
+
+	TURN_ON_LED;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov