From f75ccec2a14a7a505f046b6ea140f305d4c7cdc9 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 20 Jan 1999 19:22:24 +0000
Subject: [PATCH] *blush*.  As a quick fix, move configure()'s SYSINIT back a
 little to allow CAM's xpt_init() to get in first.  I hope this will fix the
 build again, sorry guys. :-( XXX configure_start() and configure_end() seem
 to be a bit excessive.. both here and in the i386 code.

---
 sys/alpha/alpha/autoconf.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c
index fc8f699f1fd..46aeb3ffb70 100644
--- a/sys/alpha/alpha/autoconf.c
+++ b/sys/alpha/alpha/autoconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: autoconf.c,v 1.11 1998/10/06 08:38:04 dfr Exp $
+ *	$Id: autoconf.c,v 1.12 1998/10/30 01:36:40 jkh Exp $
  */
 
 #include "opt_bootp.h"
@@ -58,24 +58,17 @@
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_debug.h>
 
-#include "scbus.h"
-
 static void	configure __P((void *));
-SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_FIRST, configure, NULL)
+SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL)
 
 static void	configure_finish __P((void));
 static void	configure_start __P((void));
 device_t	isa_bus_device = 0;
 struct cam_sim *boot_sim = 0;
 
-extern void xpt_init __P((void));
-
 static void
 configure_start()
 {
-#if NSCBUS > 0
-	xpt_init();
-#endif
 }
 
 static void