Finish removal of reminents of as.c Adaptec scsi driver.

4 files changed, 4 insertions, 29 deletions

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 5bd812203bd4..8ba69f5943ef 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -121,7 +121,7 @@ ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
 
 conf.o: $S/sys/param.h $S/sys/systm.h $S/sys/buf.h $S/sys/ioctl.h \
 	$S/sys/tty.h $S/sys/conf.h \
-	as.h bpfilter.h cd.h ch.h com.h dcfclk.h fd.h lpa.h \
+	bpfilter.h cd.h ch.h com.h dcfclk.h fd.h lpa.h \
 	lpt.h pty.h sd.h speaker.h st.h wd.h wt.h \
 	${I386}/i386/conf.c
 	${CC} -traditional -c ${CFLAGS} ${I386}/i386/conf.c
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 5bd812203bd4..8ba69f5943ef 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -121,7 +121,7 @@ ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
 
 conf.o: $S/sys/param.h $S/sys/systm.h $S/sys/buf.h $S/sys/ioctl.h \
 	$S/sys/tty.h $S/sys/conf.h \
-	as.h bpfilter.h cd.h ch.h com.h dcfclk.h fd.h lpa.h \
+	bpfilter.h cd.h ch.h com.h dcfclk.h fd.h lpa.h \
 	lpt.h pty.h sd.h speaker.h st.h wd.h wt.h \
 	${I386}/i386/conf.c
 	${CC} -traditional -c ${CFLAGS} ${I386}/i386/conf.c
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 5bd812203bd4..8ba69f5943ef 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -121,7 +121,7 @@ ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
 
 conf.o: $S/sys/param.h $S/sys/systm.h $S/sys/buf.h $S/sys/ioctl.h \
 	$S/sys/tty.h $S/sys/conf.h \
-	as.h bpfilter.h cd.h ch.h com.h dcfclk.h fd.h lpa.h \
+	bpfilter.h cd.h ch.h com.h dcfclk.h fd.h lpa.h \
 	lpt.h pty.h sd.h speaker.h st.h wd.h wt.h \
 	${I386}/i386/conf.c
 	${CC} -traditional -c ${CFLAGS} ${I386}/i386/conf.c
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c
index a35157bc4f04..dfde3a087a84 100644
--- a/sys/i386/i386/conf.c
+++ b/sys/i386/i386/conf.c
@@ -56,7 +56,7 @@
  * 28 Jul 93	Jordan K. Hubbard	Free codrv's slot again
  *
  */
-static char rcsid[] = "$Header: /freefall/a/cvs/386BSD/src/sys/i386/i386/conf.c,v 1.2 1993/07/30 00:57:06 jkh Exp $";
+static char rcsid[] = "$Header: /freefall/a/cvs/386BSD/src/sys/i386/i386/conf.c,v 1.3 1993/08/09 06:16:38 rgrimes Exp $";
 
 #include "param.h"
 #include "systm.h"
@@ -81,20 +81,6 @@ int	wddump(),wdsize();
 #define	wdsize		NULL
 #endif
 
-#include "as.h"
-#if NAS > 0
-int	asopen(),asclose(),asstrategy(),asioctl();
-int	/*asdump(),*/assize();
-#define	asdump		enxio
-#else
-#define	asopen		enxio
-#define	asclose		enxio
-#define	asstrategy	enxio
-#define	asioctl		enxio
-#define	asdump		enxio
-#define	assize		NULL
-#endif
-
 #include "sd.h"
 #if NSD > 0
 int	sdopen(),sdclose(),sdstrategy(),sdioctl();
@@ -187,13 +173,8 @@ struct bdevsw	bdevsw[] =
 	  fddump,	fdsize,		NULL },
 	{ wtopen,	wtclose,	wtstrategy,	wtioctl,	/*3*/
 	  wtdump,	wtsize,		B_TAPE },
-#if NSD > 0
 	{ sdopen,	sdclose,	sdstrategy,	sdioctl,	/*4*/
 	  sddump,	sdsize,		NULL },
-#else NSD > 0
-	{ asopen,	asclose,	asstrategy,	asioctl,	/*4*/
-	  asdump,	assize,		NULL },
-#endif NSD > 0
 	{ stopen,	stclose,	ststrategy,	stioctl,	/*5*/
 	  stdump,	stsize,		NULL },
 	{ cdopen,	cdclose,	cdstrategy,	cdioctl,	/*6*/
@@ -392,15 +373,9 @@ struct cdevsw	cdevsw[] =
 	{ pcopen,	pcclose,	pcread,		pcwrite,	/*12*/
 	  pcioctl,	nullop,		nullop,		&pccons, /* pc */
 	  ttselect,	pcmmap,		NULL },
-#if	NSD > 0
 	{ sdopen,	sdclose,	rawread,	rawwrite,	/*13*/
 	  sdioctl,	enodev,		nullop,		NULL,	/* sd */
 	  seltrue,	enodev,		sdstrategy },
-#else	NSD > 0
-	{ asopen,	asclose,	rawread,	rawwrite,	/*13*/
-	  asioctl,	enodev,		nullop,		NULL,	/* as */
-	  seltrue,	enodev,		asstrategy },
-#endif	NSD > 0
 	{ stopen,	stclose,	rawread,	rawwrite,	/*14*/
 	  stioctl,	enodev,		nullop,		NULL,	/* st */
 	  seltrue,	enodev,		ststrategy },