diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /arch/sparc/kernel/auxio.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'arch/sparc/kernel/auxio.c')
| -rw-r--r-- | arch/sparc/kernel/auxio.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/sparc/kernel/auxio.c b/arch/sparc/kernel/auxio.c index 13d34310f..a5e24ac52 100644 --- a/arch/sparc/kernel/auxio.c +++ b/arch/sparc/kernel/auxio.c @@ -5,6 +5,7 @@ #include <linux/stddef.h> #include <linux/init.h> +#include <linux/config.h> #include <asm/oplib.h> #include <asm/io.h> #include <asm/auxio.h> @@ -32,6 +33,11 @@ __initfunc(void auxio_probe(void)) node = prom_getchild(node); auxio_nd = prom_searchsiblings(node, "auxio"); if(!auxio_nd) { +#ifdef CONFIG_PCI + /* There may be auxio on Ebus */ + auxio_register = 0; + return; +#else if(prom_searchsiblings(node, "leds")) { /* VME chassis sun4m machine, no auxio exists. */ auxio_register = 0; @@ -39,6 +45,7 @@ __initfunc(void auxio_probe(void)) } prom_printf("Cannot find auxio node, cannot continue...\n"); prom_halt(); +#endif } } prom_getproperty(auxio_nd, "reg", (char *) auxregs, sizeof(auxregs)); |