Commit 000e8d1d authored by David S. Miller's avatar David S. Miller

SPARC64: Fix fallout from sparc32 updates.

parent 2c6fcd47
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/bpp.h> #include <asm/bpp.h>
#include <asm/irq.h> #include <asm/irq.h>
#ifdef CONFIG_SPARC32
#include <asm/pcic.h> /* pcic_present */ #include <asm/pcic.h> /* pcic_present */
#endif
struct sbus_bus *sbus_root = NULL; struct sbus_bus *sbus_root = NULL;
...@@ -335,10 +337,17 @@ static int __init sbus_init(void) ...@@ -335,10 +337,17 @@ static int __init sbus_init(void)
(nd = prom_getchild(iommund)) == 0 || (nd = prom_getchild(iommund)) == 0 ||
(nd = prom_searchsiblings(nd, "sbus")) == 0) { (nd = prom_searchsiblings(nd, "sbus")) == 0) {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#ifdef CONFIG_SPARC32
if (!pcic_present()) { if (!pcic_present()) {
prom_printf("Neither SBUS nor PCI found.\n"); prom_printf("Neither SBUS nor PCI found.\n");
prom_halt(); prom_halt();
} }
#else
if (!pcibios_present()) {
prom_printf("Neither SBUS nor PCI found.\n");
prom_halt();
}
#endif
return 0; return 0;
#else #else
/* No reason to run further - the data access trap will occur. */ /* No reason to run further - the data access trap will occur. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment