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

• Lines: 30
• Date: Fri Dec 13 11:37:30 1996
• Orig file: v2.1.15/linux/arch/sparc/kernel/auxio.c
• Orig date: Tue Nov 12 15:56:02 1996

diff -u --recursive --new-file v2.1.15/linux/arch/sparc/kernel/auxio.c linux/arch/sparc/kernel/auxio.c
@@ -3,6 +3,7 @@
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
+#include <linux/init.h>
 #include <asm/oplib.h>
 #include <asm/io.h>
 #include <asm/auxio.h>
@@ -10,8 +11,7 @@
 /* Probe and map in the Auxiliary I/O register */
 unsigned char *auxio_register;
 
-void
-auxio_probe(void)
+__initfunc(void auxio_probe(void))
 {
 	int node, auxio_nd;
 	struct linux_prom_registers auxregs[1];
@@ -27,6 +27,11 @@
 		node = prom_getchild(node);
 		auxio_nd = prom_searchsiblings(node, "auxio");
 		if(!auxio_nd) {
+			if(prom_searchsiblings(node, "leds")) {
+				/* VME chassis sun4m machine, no auxio exists. */
+				auxio_register = 0;
+				return;
+			}
 			prom_printf("Cannot find auxio node, cannot continue...\n");
 			prom_halt();
 		}