patch-2.1.127 linux/drivers/sbus/sbus.c

• Lines: 23
• Date: Tue Oct 27 09:52:21 1998
• Orig file: v2.1.126/linux/drivers/sbus/sbus.c
• Orig date: Mon Oct 5 13:13:40 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/sbus/sbus.c linux/drivers/sbus/sbus.c
@@ -1,4 +1,4 @@
-/* $Id: sbus.c,v 1.72 1998/09/05 17:25:51 jj Exp $
+/* $Id: sbus.c,v 1.73 1998/10/07 11:35:50 jj Exp $
  * sbus.c:  SBus support routines.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -278,8 +278,16 @@
 		if((iommund = prom_searchsiblings(topnd, "iommu")) == 0 ||
 		   (nd = prom_getchild(iommund)) == 0 ||
 		   (nd = prom_searchsiblings(nd, "sbus")) == 0) {
+#ifdef CONFIG_PCI
+                        if (!pcibios_present()) {       
+                                prom_printf("Neither SBUS nor PCI found.\n");
+                                prom_halt();
+                        }
+                        return;
+#else
 			/* No reason to run further - the data access trap will occur. */
 			panic("sbus not found");
+#endif
 		}
 	}