? sys/conf/modules
? sys/i386/conf/THUNDER
? sys/i386/conf/FOO
? sys/i386/conf/FOO.hints
? sys/i386/conf/LINT
? sys/i386/conf/TEST
? sys/i386/conf/LINT.err
? sys/i386/conf/GENERIC.err
? sys/i386/conf/NEWCARD.err
Index: usr.sbin/config/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- usr.sbin/config/Makefile	2001/02/19 04:43:21	1.28
+++ usr.sbin/config/Makefile	2001/02/22 05:36:19
@@ -10,6 +10,9 @@
 DPADD=	${LIBL}
 LDADD=	-ll
 
+STRIP=
+CFLAGS+=-g
+
 mkmakefile.o: configvers.h
 
 .include <bsd.prog.mk>
Index: usr.sbin/config/config.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/config.h,v
retrieving revision 1.45
diff -u -r1.45 config.h
--- usr.sbin/config/config.h	2001/02/22 03:40:50	1.45
+++ usr.sbin/config/config.h	2001/02/22 05:36:19
@@ -71,15 +71,11 @@
 #define NO_IMPLCT_RULE	2
 #define NO_OBJ		4
 #define BEFORE_DEPEND	8
-#define NEED_COUNT	16
-#define ISDUP		32
+#define ISDUP		16
 
 struct device {
 	int	d_done;			/* processed */
 	char	*d_name;		/* name of device (e.g. rk11) */
-	int	d_count;		/* device count */
-#define QUES	-1	/* -1 means '?' */
-#define	UNKNOWN -2	/* -2 means not set yet */
 	struct	device *d_next;		/* Next one in list */
 };
 
Index: usr.sbin/config/config.y
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/config.y,v
retrieving revision 1.54
diff -u -r1.54 config.y
--- usr.sbin/config/config.y	2001/02/22 04:00:29	1.54
+++ usr.sbin/config/config.y	2001/02/22 05:36:19
@@ -221,15 +221,7 @@
 	      = {
 		newopt(&opt, devopt($2), ns("1"));
 		/* and the device part */
-		newdev($2, UNKNOWN);
-		} |
-	DEVICE Dev NUMBER
-	      = {
-		newopt(&opt, devopt($2), ns("1"));
-		/* and the device part */
-		newdev($2, $3);
-		if ($3 == 0)
-			errx(1, "line %d: devices with zero units are not likely to be correct", yyline);
+		newdev($2);
 		} ;
 
 %%
@@ -245,14 +237,13 @@
  * add a device to the list of devices
  */
 static void
-newdev(char *name, int count)
+newdev(char *name)
 {
 	struct device *np;
 
 	np = (struct device *) malloc(sizeof *np);
 	memset(np, 0, sizeof(*np));
 	np->d_name = name;
-	np->d_count = count;
 	np->d_next = 0;
 	if (curp == 0)
 		dtab = np;
Index: usr.sbin/config/configvers.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/configvers.h,v
retrieving revision 1.25
diff -u -r1.25 configvers.h
--- usr.sbin/config/configvers.h	2001/01/19 12:49:21	1.25
+++ usr.sbin/config/configvers.h	2001/02/22 05:36:19
@@ -8,4 +8,4 @@
  *
  * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.25 2001/01/19 12:49:21 peter Exp $
  */
-#define	CONFIGVERS	500006
+#define	CONFIGVERS	500007
Index: usr.sbin/config/lang.l
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/lang.l,v
retrieving revision 1.30
diff -u -r1.30 lang.l
--- usr.sbin/config/lang.l	2001/02/19 04:43:21	1.30
+++ usr.sbin/config/lang.l	2001/02/22 05:36:19
@@ -58,6 +58,7 @@
 	{ "machine",	ARCH }, /* MACHINE is defined in /sys/param.h */
 	{ "makeoptions", MAKEOPTIONS },
 	{ "maxusers",	MAXUSERS },
+	{ "module",	DEVICE },
 	{ "profile",	PROFILE },
 	{ "option",	OPTIONS },
 	{ "options",	OPTIONS },
@@ -74,24 +75,11 @@
 ID	[A-Za-z_][-A-Za-z_0-9]*
 %START NONUM TOEOL
 %%
-<NONUM>{WORD}	{
-			int i;
-
-			BEGIN 0;
-			if ((i = kw_lookup(yytext)) == -1)
-			{
-				yylval.str = strdup(yytext);
-				return ID;
-			}
-			return i;
-		}
 <INITIAL>{WORD}/[0-9]* {
 			int i;
 
 			if ((i = kw_lookup(yytext)) == -1)
 				REJECT;
-			if (i == DEVICE)
-				BEGIN NONUM;
 			return i;
 		}
 <INITIAL>{ID}	{
Index: usr.sbin/config/mkheaders.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/mkheaders.c,v
retrieving revision 1.22
diff -u -r1.22 mkheaders.c
--- usr.sbin/config/mkheaders.c	2001/01/31 11:18:49	1.22
+++ usr.sbin/config/mkheaders.c	2001/02/22 05:36:19
@@ -51,28 +51,18 @@
 #include "config.h"
 #include "y.tab.h"
 
-static void do_header(char *, int);
-static char *toheader(char *);
-static char *tomacro(char *);
-
 void
 headers(void)
 {
 	struct file_list *fl;
 	struct device *dp;
-	int match;
 
 	for (fl = ftab; fl != 0; fl = fl->f_next) {
 		if (fl->f_needs != 0) {
-			match = 0;
 			for (dp = dtab; dp != 0; dp = dp->d_next) {
-				if (eq(dp->d_name, fl->f_needs)) {
-					match++;
+				if (eq(dp->d_name, fl->f_needs))
 					dp->d_done |= DEVDONE;
-				}
 			}
-			if (fl->f_flags & NEED_COUNT)
-				do_header(fl->f_needs, match);
 		}
 	}
 	for (dp = dtab; dp != 0; dp = dp->d_next) {
@@ -80,126 +70,4 @@
 			errx(1, "Error: device \"%s\" is unknown",
 			       dp->d_name);
 	}
-}
-
-static void
-do_header(char *dev, int match)
-{
-	char *file, *name, *inw;
-	struct file_list *fl, *fl_head, *tflp;
-	struct device *dp;
-	FILE *inf, *outf;
-	int inc, oldcount;
-	int count, hicount;
-
-	/*
-	 * After this loop, "count" will be the actual number of units,
-	 * and "hicount" will be the highest unit declared.  do_header()
-	 * must use this higher of these values.
-	 */
-	for (hicount = count = 0, dp = dtab; dp != 0; dp = dp->d_next) {
-		if (eq(dp->d_name, dev)) {
-			count =
-			    dp->d_count != UNKNOWN ? dp->d_count : 1;
-			break;
-		}
-	}
-	file = toheader(dev);
-	name = tomacro(dev);
-	if (match)
-		printf("FYI: static unit limits for %s are set: %s=%d\n", dev, name, count);
-	remember(file);
-	inf = fopen(file, "r");
-	oldcount = -1;
-	if (inf == 0) {
-		outf = fopen(file, "w");
-		if (outf == 0)
-			err(1, "%s", file);
-		fprintf(outf, "#define %s %d\n", name, count);
-		(void) fclose(outf);
-		return;
-	}
-	fl_head = NULL;
-	for (;;) {
-		char *cp;
-		if ((inw = get_word(inf)) == 0 || inw == (char *)EOF)
-			break;
-		if ((inw = get_word(inf)) == 0 || inw == (char *)EOF)
-			break;
-		inw = ns(inw);
-		cp = get_word(inf);
-		if (cp == 0 || cp == (char *)EOF)
-			break;
-		inc = atoi(cp);
-		if (eq(inw, name)) {
-			oldcount = inc;
-			inc = count;
-		}
-		cp = get_word(inf);
-		if (cp == (char *)EOF)
-			break;
-		fl = (struct file_list *) malloc(sizeof *fl);
-		bzero(fl, sizeof(*fl));
-		fl->f_fn = inw;		/* malloced */
-		fl->f_type = inc;
-		fl->f_next = fl_head;
-		fl_head = fl;
-	}
-	(void) fclose(inf);
-	if (count == oldcount) {
-		for (fl = fl_head; fl != NULL; fl = tflp) {
-			tflp = fl->f_next;
-			free(fl->f_fn);
-			free(fl);
-		}
-		return;
-	}
-	if (oldcount == -1) {
-		fl = (struct file_list *) malloc(sizeof *fl);
-		bzero(fl, sizeof(*fl));
-		fl->f_fn = ns(name);
-		fl->f_type = count;
-		fl->f_next = fl_head;
-		fl_head = fl;
-	}
-	outf = fopen(file, "w");
-	if (outf == 0)
-		err(1, "%s", file);
-	for (fl = fl_head; fl != NULL; fl = tflp) {
-		fprintf(outf,
-		    "#define %s %u\n", fl->f_fn, count ? fl->f_type : 0);
-		tflp = fl->f_next;
-		free(fl->f_fn);
-		free(fl);
-	}
-	(void) fclose(outf);
-}
-
-/*
- * convert a dev name to a .h file name
- */
-static char *
-toheader(char *dev)
-{
-	static char hbuf[MAXPATHLEN];
-
-	snprintf(hbuf, sizeof(hbuf), "%s.h", path(dev));
-	return (hbuf);
-}
-
-/*
- * convert a dev name to a macro name
- */
-static char *
-tomacro(char *dev)
-{
-	static char mbuf[20];
-	char *cp;
-
-	cp = mbuf;
-	*cp++ = 'N';
-	while (*dev)
-		*cp++ = islower(*dev) ? toupper(*dev++) : *dev++;
-	*cp++ = 0;
-	return (mbuf);
 }
Index: usr.sbin/config/mkmakefile.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/mkmakefile.c,v
retrieving revision 1.62
diff -u -r1.62 mkmakefile.c
--- usr.sbin/config/mkmakefile.c	2001/02/19 04:43:21	1.62
+++ usr.sbin/config/mkmakefile.c	2001/02/22 05:36:19
@@ -285,7 +285,7 @@
 	char fname[MAXPATHLEN];
 	int ddwarned = 0;
 	int nreqs, first = 1, configdep, isdup, std, filetype,
-	    imp_rule, no_obj, needcount, before_depend, mandatory;
+	    imp_rule, no_obj, before_depend, mandatory;
 
 	ftab = 0;
 	save_dp = NULL;
@@ -300,7 +300,7 @@
 		err(1, "%s", fname);
 next:
 	/*
-	 * filename    [ standard | mandatory | optional | count ]
+	 * filename    [ standard | mandatory | optional ]
 	 *	[ config-dependent ]
 	 *	[ dev* | profiling-routine ] [ no-obj ]
 	 *	[ compile-with "compile rule" [no-implicit-rule] ]
@@ -370,7 +370,6 @@
 	std = mandatory = 0;
 	imp_rule = 0;
 	no_obj = 0;
-	needcount = 0;
 	before_depend = 0;
 	filetype = NORMAL;
 	if (eq(wd, "standard")) {
@@ -382,10 +381,8 @@
 	 */
 	} else if (eq(wd, "mandatory")) {
 		mandatory = 1;
-	} else if (eq(wd, "count")) {
-		needcount = 1;
 	} else if (!eq(wd, "optional")) {
-		printf("%s: %s must be count, optional, mandatory or standard\n",
+		printf("%s: %s must be optional, mandatory or standard\n",
 		       fname, this);
 		exit(1);
 	}
@@ -479,11 +476,8 @@
 	if (isdup)
 		goto invis;
 	for (dp = dtab; dp != 0; save_dp = dp, dp = dp->d_next)
-		if (eq(dp->d_name, wd)) {
-			if (std && dp->d_count <= 0)
-				dp->d_count = 1;
+		if (eq(dp->d_name, wd))
 			goto nextparam;
-		}
 	if (mandatory) {
 		printf("%s: mandatory device \"%s\" not found\n",
 		       fname, wd);
@@ -493,7 +487,6 @@
 		dp = (struct device *) malloc(sizeof *dp);
 		bzero(dp, sizeof *dp);
 		dp->d_name = ns(wd);
-		dp->d_count = 1;
 		save_dp->d_next = dp;
 		goto nextparam;
 	}
@@ -514,8 +507,6 @@
 	tp->f_type = INVISIBLE;
 	tp->f_needs = needs;
 	tp->f_flags |= isdup;
-	if (needcount)
-		tp->f_flags |= NEED_COUNT;
 	tp->f_special = special;
 	tp->f_depends = depends;
 	tp->f_clean = clean;
@@ -553,8 +544,6 @@
 		tp->f_flags |= NO_IMPLCT_RULE;
 	if (no_obj)
 		tp->f_flags |= NO_OBJ;
-	if (needcount)
-		tp->f_flags |= NEED_COUNT;
 	tp->f_needs = needs;
 	tp->f_special = special;
 	tp->f_depends = depends;
Index: sys/conf/Makefile.alpha
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.alpha,v
retrieving revision 1.91
diff -u -r1.91 Makefile.alpha
--- sys/conf/Makefile.alpha	2001/02/17 07:26:57	1.91
+++ sys/conf/Makefile.alpha	2001/02/22 05:36:19
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500006
+%VERSREQ=	500007
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
Index: sys/conf/Makefile.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v
retrieving revision 1.224
diff -u -r1.224 Makefile.i386
--- sys/conf/Makefile.i386	2001/02/17 07:26:57	1.224
+++ sys/conf/Makefile.i386	2001/02/22 05:36:19
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500006
+%VERSREQ=	500007
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
@@ -275,14 +275,15 @@
 reinstall.debug: modules-reinstall.debug
 .endif
 
-MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
+MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} \
+		CONFDIR=${.CURDIR}
 
-modules:
+modules:	${MFILES:T:S/.m$/.h/} vnode_if.h
 	@mkdir -p ${.OBJDIR}/modules
 	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
 	    env ${MKMODULESENV} ${MAKE} all
 
-modules-depend:
+modules-depend:	${MFILES:T:S/.m$/.h/} vnode_if.h
 	@mkdir -p ${.OBJDIR}/modules
 	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
 	    env ${MKMODULESENV} ${MAKE} depend
Index: sys/conf/Makefile.ia64
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.ia64,v
retrieving revision 1.14
diff -u -r1.14 Makefile.ia64
--- sys/conf/Makefile.ia64	2001/02/12 05:55:33	1.14
+++ sys/conf/Makefile.ia64	2001/02/22 05:36:19
@@ -27,7 +27,7 @@
 MACHINE_ARCH=	ia64
 
 # Which version of config(8) is required.
-%VERSREQ=	500006
+%VERSREQ=	500007
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
Index: sys/conf/Makefile.pc98
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.pc98,v
retrieving revision 1.123
diff -u -r1.123 Makefile.pc98
--- sys/conf/Makefile.pc98	2001/02/17 07:26:57	1.123
+++ sys/conf/Makefile.pc98	2001/02/22 05:36:19
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500006
+%VERSREQ=	500007
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
Index: sys/conf/files
===================================================================
RCS file: /home/ncvs/src/sys/conf/files,v
retrieving revision 1.487
diff -u -r1.487 files
--- sys/conf/files	2001/02/08 04:58:17	1.487
+++ sys/conf/files	2001/02/22 05:36:19
@@ -39,7 +39,7 @@
 cam/scsi/scsi_ses.c	optional ses
 cam/scsi/scsi_targ_bh.c	optional targbh
 cam/scsi/scsi_target.c	optional targ
-coda/coda_fbsd.c	count vcoda
+coda/coda_fbsd.c	optional vcoda
 coda/coda_namecache.c	optional vcoda
 coda/coda_psdev.c	optional vcoda
 coda/coda_subr.c	optional vcoda
@@ -259,7 +259,7 @@
 dev/awi/if_awi_pccard.c	optional awi pccard
 dev/bktr/bktr_audio.c	optional bktr pci
 dev/bktr/bktr_card.c	optional bktr pci
-dev/bktr/bktr_core.c	count bktr pci
+dev/bktr/bktr_core.c	optional bktr pci
 dev/bktr/bktr_i2c.c	optional bktr pci smbus
 dev/bktr/bktr_os.c	optional bktr pci
 dev/bktr/bktr_tuner.c	optional bktr pci
@@ -270,13 +270,13 @@
 dev/buslogic/bt_pci.c	optional bt pci
 dev/cardbus/cardbus.c	optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
-dev/ccd/ccd.c		count ccd
+dev/ccd/ccd.c		optional ccd
 dev/cs/if_cs.c		optional cs
 dev/cs/if_cs_isa.c	optional cs isa
 dev/cs/if_cs_pccard.c	optional cs card
 dev/cs/if_cs_pccard.c	optional cs pccard
-dev/dgb/dgb.c		count		dgb
-dev/dgb/dgm.c		count		dgm
+dev/dgb/dgb.c		optional dgb
+dev/dgb/dgm.c		optional dgm
 #dev/dpt/dpt_control.c	optional dpt
 dev/dpt/dpt_eisa.c	optional dpt eisa
 dev/dpt/dpt_pci.c	optional dpt pci
@@ -327,7 +327,7 @@
 dev/ida/ida_disk.c	optional ida
 dev/ida/ida_eisa.c	optional ida eisa
 dev/ida/ida_pci.c	optional ida pci
-dev/ie/if_ie.c		count ie isa
+dev/ie/if_ie.c		optional ie isa
 dev/iicbus/iicbb_if.m	optional iicbb
 dev/iicbus/iicbus_if.m	optional iicbus
 dev/iicbus/if_ic.c	optional ic
@@ -395,7 +395,7 @@
 dev/pci/fixup_pci.c	optional pci
 dev/pci/ignore_pci.c	optional pci
 dev/pci/isa_pci.c	optional pci
-dev/pci/pci.c		count pci
+dev/pci/pci.c		optional pci
 dev/pci/pci_if.m	optional pci
 dev/pci/pci_pci.c	optional pci
 dev/pci/pci_user.c	optional pci
@@ -443,7 +443,7 @@
 dev/smbus/smbus_if.m	optional smbus
 dev/smbus/smb.c		optional smb
 dev/smbus/smbconf.c	optional smbus
-dev/smbus/smbus.c	count smbus
+dev/smbus/smbus.c	optional smbus
 dev/sn/if_sn.c		optional sn
 dev/sn/if_sn_isa.c	optional sn isa
 dev/sn/if_sn_pccard.c	optional sn card
@@ -583,14 +583,14 @@
 #
 # isdn4bsd device drivers
 #
-i4b/driver/i4b_trace.c		count i4btrc
-i4b/driver/i4b_rbch.c		count i4brbch
-i4b/driver/i4b_tel.c		count i4btel
-i4b/driver/i4b_ipr.c		count i4bipr
+i4b/driver/i4b_trace.c		optional i4btrc
+i4b/driver/i4b_rbch.c		optional i4brbch
+i4b/driver/i4b_tel.c		optional i4btel
+i4b/driver/i4b_ipr.c		optional i4bipr
 net/slcompress.c		optional i4bipr
-i4b/driver/i4b_ctl.c		count i4bctl
-i4b/driver/i4b_ing.c		count i4bing
-i4b/driver/i4b_isppp.c		count i4bisppp
+i4b/driver/i4b_ctl.c		optional i4bctl
+i4b/driver/i4b_ing.c		optional i4bing
+i4b/driver/i4b_isppp.c		optional i4bisppp
 i4b/driver/i4b_ispppsubr.c	optional i4bisppp
 net/slcompress.c		optional i4bisppp
 #
@@ -600,7 +600,7 @@
 #
 # isdn4bsd Q.921 handler
 #
-i4b/layer2/i4b_l2.c		count i4bq921
+i4b/layer2/i4b_l2.c		optional i4bq921
 i4b/layer2/i4b_l2fsm.c		optional i4bq921
 i4b/layer2/i4b_uframe.c		optional i4bq921
 i4b/layer2/i4b_tei.c		optional i4bq921
@@ -612,7 +612,7 @@
 #
 # isdn4bsd Q.931 handler
 #
-i4b/layer3/i4b_q931.c		count i4bq931
+i4b/layer3/i4b_q931.c		optional i4bq931
 i4b/layer3/i4b_l3fsm.c		optional i4bq931
 i4b/layer3/i4b_l3timer.c	optional i4bq931
 i4b/layer3/i4b_l2if.c		optional i4bq931
@@ -621,7 +621,7 @@
 #
 # isdn4bsd control device driver, interface to isdnd
 #
-i4b/layer4/i4b_i4bdrv.c		count i4b
+i4b/layer4/i4b_i4bdrv.c		optional i4b
 i4b/layer4/i4b_l4.c		optional i4b
 i4b/layer4/i4b_l4mgmt.c		optional i4b
 i4b/layer4/i4b_l4timer.c	optional i4b
@@ -817,20 +817,20 @@
 net/if_disc.c		optional disc
 net/if_ef.c		optional ef
 net/if_ethersubr.c	optional ether
-net/if_faith.c		count faith
+net/if_faith.c		optional faith
 net/if_fddisubr.c	optional fddi
-net/if_gif.c		count gif
+net/if_gif.c		optional gif
 net/if_iso88025subr.c	optional token
 net/if_loop.c		optional loop
 net/if_media.c		standard
 net/if_mib.c		standard
-net/if_ppp.c		count ppp
+net/if_ppp.c		optional ppp
 net/if_sl.c		optional sl
 net/if_spppsubr.c	optional sppp
-net/if_stf.c		count stf
+net/if_stf.c		optional stf
 net/if_tun.c		optional tun
 net/if_tap.c		optional tap
-net/if_vlan.c		count vlan
+net/if_vlan.c		optional vlan
 net/intrq.c		standard
 net/net_osdep.c		standard
 net/ppp_deflate.c	optional ppp_deflate
@@ -1103,7 +1103,7 @@
 nwfs/nwfs_subr.c	optional nwfs
 nwfs/nwfs_vfsops.c	optional nwfs
 nwfs/nwfs_vnops.c	optional nwfs
-pccard/pccard.c		count card
+pccard/pccard.c		optional card
 pccard/pccard_beep.c	optional card
 pccard/pccard_nbk.c	optional card
 pccard/pcic.c		optional pcic card
@@ -1137,7 +1137,7 @@
 pci/if_wx.c		optional wx
 pci/if_xl.c		optional xl
 pci/intpm.c		optional intpm
-pci/meteor.c		count meteor pci
+pci/meteor.c		optional meteor pci
 pci/ncr.c		optional ncr
 pci/ohci_pci.c		optional ohci
 dev/pccbb/pccbb.c	optional pccbb
Index: sys/conf/files.alpha
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.alpha,v
retrieving revision 1.66
diff -u -r1.66 files.alpha
--- sys/conf/files.alpha	2001/01/31 10:54:45	1.66
+++ sys/conf/files.alpha	2001/02/22 05:36:19
@@ -185,15 +185,15 @@
 dev/ed/if_ed_isa.c		optional	ed isa
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
-dev/fb/splash.c			count		splash
+dev/fb/splash.c			optional	splash
 dev/fb/vga.c			optional	vga
 dev/kbd/atkbd.c			optional	atkbd
-dev/kbd/atkbdc.c		count		atkbdc
+dev/kbd/atkbdc.c		optional	atkbdc
 dev/kbd/kbd.c			optional	atkbd
 dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
-dev/syscons/schistory.c		count		sc
+dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
Index: sys/conf/files.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.i386,v
retrieving revision 1.357
diff -u -r1.357 files.i386
--- sys/conf/files.i386	2001/02/06 12:05:12	1.357
+++ sys/conf/files.i386	2001/02/22 05:36:19
@@ -95,18 +95,18 @@
 dev/eisa/eisaconf.c		optional	eisa
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
-dev/fb/splash.c			count		splash
+dev/fb/splash.c			optional	splash
 dev/fb/vga.c			optional	vga
 dev/fe/if_fe_isa.c		optional	fe isa
 dev/kbd/atkbd.c			optional	atkbd
-dev/kbd/atkbdc.c		count		atkbdc
+dev/kbd/atkbdc.c		optional	atkbdc
 dev/kbd/kbd.c			optional	atkbd
 dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
 dev/kbd/kbd.c			optional	vt
 dev/sr/if_sr_isa.c		optional	sr isa
-dev/syscons/schistory.c		count		sc
+dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
@@ -207,21 +207,21 @@
 i386/ibcs2/ibcs2_xenix.c	optional	ibcs2
 i386/ibcs2/ibcs2_xenix_sysent.c	optional	ibcs2
 i386/ibcs2/imgact_coff.c	optional	ibcs2
-i386/isa/asc.c			count		asc
+i386/isa/asc.c			optional	asc
 i386/isa/clock.c		standard
 i386/isa/cronyx.c		optional	cx
-i386/isa/ctx.c			count		ctx
-i386/isa/cx.c			count		cx
-i386/isa/cy.c			count		cy
+i386/isa/ctx.c			optional	ctx
+i386/isa/cx.c			optional	cx
+i386/isa/cy.c			optional	cy
 i386/isa/elink.c		optional	ep
 i386/isa/elink.c		optional	ie
 i386/isa/gpib.c			optional	gp
-i386/isa/gsc.c			count		gsc
+i386/isa/gsc.c			optional	gsc
 i386/isa/if_cx.c		optional	cx
-i386/isa/if_el.c		count		el
-i386/isa/if_le.c		count		le
-i386/isa/if_rdp.c		count		rdp
-i386/isa/if_wl.c		count		wl
+i386/isa/if_el.c		optional	el
+i386/isa/if_le.c		optional	le
+i386/isa/if_rdp.c		optional	rdp
+i386/isa/if_wl.c		optional	wl
 i386/isa/if_wlp.c		optional	wlp
 i386/isa/intr_machdep.c		standard
 i386/isa/ithread.c		standard
@@ -231,9 +231,9 @@
 i386/isa/isa_dma.c		optional	isa
 i386/isa/istallion.c		optional	stli
 i386/isa/loran.c		optional	loran
-i386/isa/matcd/matcd.c		count		matcd
+i386/isa/matcd/matcd.c		optional	matcd
 i386/isa/mca_machdep.c		optional	mca
-i386/isa/mcd.c			count		mcd
+i386/isa/mcd.c			optional	mcd
 i386/isa/mse.c			optional	mse
 i386/isa/npx.c			mandatory	npx
 i386/isa/pcaudio.c		optional	pca
@@ -246,16 +246,16 @@
 i386/isa/pcvt/pcvt_vtf.c	optional	vt
 i386/isa/pmtimer.c		optional	pmtimer
 i386/isa/prof_machdep.c		optional	profiling-routine
-i386/isa/rc.c			count		rc
+i386/isa/rc.c			optional	rc
 #i386/isa/rp.c			optional	rp
-i386/isa/scd.c			count		scd
+i386/isa/scd.c			optional	scd
 i386/isa/spic.c			optional	spic
-i386/isa/spigot.c		count		spigot
+i386/isa/spigot.c		optional	spigot
 i386/isa/spkr.c			optional	speaker
 i386/isa/stallion.c		optional	stl
-i386/isa/tw.c			count		tw
+i386/isa/tw.c			optional	tw
 i386/isa/vesa.c			optional	vga vesa
-i386/isa/wt.c			count		wt
+i386/isa/wt.c			optional	wt
 i386/linux/imgact_linux.c	optional	compat_linux
 i386/linux/linux_dummy.c	optional	compat_linux
 i386/linux/linux_locore.s	optional	compat_linux		\
@@ -298,7 +298,7 @@
 i4b/layer1/isic/i4b_elsa_pcc16.c	optional	isic
 i4b/layer1/isic/i4b_hscx.c		optional	isic
 i4b/layer1/isic/i4b_isac.c		optional	isic
-i4b/layer1/isic/i4b_isic.c		count		isic
+i4b/layer1/isic/i4b_isic.c		optional	isic
 i4b/layer1/isic/i4b_isic_isa.c		optional	isic
 i4b/layer1/isic/i4b_isic_pnp.c		optional	isic
 i4b/layer1/isic/i4b_itk_ix1.c		optional	isic
@@ -314,7 +314,7 @@
 #
 # isdn4bsd, iwic
 #
-i4b/layer1/iwic/i4b_iwic_pci.c		count		iwic
+i4b/layer1/iwic/i4b_iwic_pci.c		optional	iwic
 i4b/layer1/iwic/i4b_iwic_dchan.c	optional	iwic
 i4b/layer1/iwic/i4b_iwic_bchan.c	optional	iwic
 i4b/layer1/iwic/i4b_iwic_fsm.c		optional	iwic
@@ -322,27 +322,27 @@
 #
 # isdn4bsd, ifpi
 #
-i4b/layer1/ifpi/i4b_ifpi_pci.c		count		ifpi
+i4b/layer1/ifpi/i4b_ifpi_pci.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_isac.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_l1.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_l1fsm.c	optional	ifpi
 #
 # isdn4bsd, ifpnp
 #
-i4b/layer1/ifpnp/i4b_ifpnp_avm.c	count		ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_avm.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_isac.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1.c		optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c	optional	ifpnp
 #
 # isdn4bsd, ihfc
 #
-i4b/layer1/ihfc/i4b_ihfc_l1if.c		count		ihfc
+i4b/layer1/ihfc/i4b_ihfc_l1if.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_pnp.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_drv.c		optional	ihfc
 #
 # isdn4bsd, itjc
 #
-i4b/layer1/itjc/i4b_itjc_pci.c		count		itjc
+i4b/layer1/itjc/i4b_itjc_pci.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_isac.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1fsm.c	optional	itjc
Index: sys/conf/files.ia64
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.ia64,v
retrieving revision 1.8
diff -u -r1.8 files.ia64
--- sys/conf/files.ia64	2001/01/31 10:54:45	1.8
+++ sys/conf/files.ia64	2001/02/22 05:36:19
@@ -58,15 +58,15 @@
 dev/aic/aic_isa.c		optional	aic isa
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
-dev/fb/splash.c			count		splash
+dev/fb/splash.c			optional	splash
 dev/fb/vga.c			optional	vga
 dev/kbd/atkbd.c			optional	atkbd
-dev/kbd/atkbdc.c		count		atkbdc
+dev/kbd/atkbdc.c		optional	atkbdc
 dev/kbd/kbd.c			optional	atkbd
 dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
-dev/syscons/schistory.c		count		sc
+dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
Index: sys/conf/files.pc98
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.pc98,v
retrieving revision 1.190
diff -u -r1.190 files.pc98
--- sys/conf/files.pc98	2001/02/13 14:17:21	1.190
+++ sys/conf/files.pc98	2001/02/22 05:36:19
@@ -93,19 +93,19 @@
 dev/eisa/eisaconf.c		optional	eisa
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	gdc
-dev/fb/splash.c			count		splash
+dev/fb/splash.c			optional	splash
 dev/fe/if_fe_cbus.c		optional	fe isa
 dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
-dev/kbd/kbd.c			count		pckbd
+dev/kbd/kbd.c			optional	pckbd
 dev/snc/dp83932.c		optional	snc
 dev/snc/dp83932subr.c		optional	snc
 dev/snc/if_snc.c		optional	snc
 dev/snc/if_snc_cbus.c		optional	snc isa
 dev/snc/if_snc_pccard.c		optional	snc card
 dev/sr/if_sr_isa.c		optional	sr isa
-dev/syscons/schistory.c		count		sc
+dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
@@ -201,21 +201,21 @@
 i386/isa/bs/bs.c		optional	bs
 i386/isa/bs/bsfunc.c		optional	bs
 i386/isa/bs/bshw.c		optional	bs
-i386/isa/bs/bsif.c		count		bs
-i386/isa/asc.c			count		asc
+i386/isa/bs/bsif.c		optional	bs
+i386/isa/asc.c			optional	asc
 i386/isa/cronyx.c		optional	cx
-i386/isa/ctx.c			count		ctx
-i386/isa/cx.c			count		cx
-i386/isa/cy.c			count		cy
+i386/isa/ctx.c			optional	ctx
+i386/isa/cx.c			optional	cx
+i386/isa/cy.c			optional	cy
 i386/isa/elink.c		optional	ep
 i386/isa/elink.c		optional	ie
 i386/isa/gpib.c			optional	gp
-i386/isa/gsc.c			count		gsc
+i386/isa/gsc.c			optional	gsc
 i386/isa/if_cx.c		optional	cx
-i386/isa/if_el.c		count		el
-i386/isa/if_le.c		count		le
-i386/isa/if_rdp.c		count		rdp
-i386/isa/if_wl.c		count		wl
+i386/isa/if_el.c		optional	el
+i386/isa/if_le.c		optional	le
+i386/isa/if_rdp.c		optional	rdp
+i386/isa/if_wl.c		optional	wl
 i386/isa/intr_machdep.c		standard
 i386/isa/ithread.c		standard
 i386/isa/isa.c			optional	isa
@@ -223,9 +223,9 @@
 	warning "Old ISA driver compatibility shims present."
 i386/isa/istallion.c		optional	stli
 i386/isa/loran.c		optional	loran
-i386/isa/matcd/matcd.c		count		matcd
+i386/isa/matcd/matcd.c		optional	matcd
 i386/isa/mca_machdep.c		optional	mca
-i386/isa/mcd.c			count		mcd
+i386/isa/mcd.c			optional	mcd
 i386/isa/pcf.c			optional	pcf
 i386/isa/pcvt/pcvt_drv.c	optional	vt
 i386/isa/pcvt/pcvt_ext.c	optional	vt
@@ -235,14 +235,14 @@
 i386/isa/pcvt/pcvt_vtf.c	optional	vt
 i386/isa/pmtimer.c		optional	pmtimer
 i386/isa/prof_machdep.c		optional	profiling-routine
-i386/isa/rc.c			count		rc
+i386/isa/rc.c			optional	rc
 #i386/isa/rp.c			optional	rp
-i386/isa/scd.c			count		scd
+i386/isa/scd.c			optional	scd
 i386/isa/spic.c			optional	spic
-i386/isa/spigot.c		count		spigot
+i386/isa/spigot.c		optional	spigot
 i386/isa/stallion.c		optional	stl
-i386/isa/tw.c			count		tw
-i386/isa/wt.c			count		wt
+i386/isa/tw.c			optional	tw
+i386/isa/wt.c			optional	wt
 i386/linux/imgact_linux.c	optional	compat_linux
 i386/linux/linux_dummy.c	optional	compat_linux
 i386/linux/linux_locore.s	optional	compat_linux		\
@@ -285,7 +285,7 @@
 i4b/layer1/isic/i4b_elsa_pcc16.c	optional	isic
 i4b/layer1/isic/i4b_hscx.c		optional	isic
 i4b/layer1/isic/i4b_isac.c		optional	isic
-i4b/layer1/isic/i4b_isic.c		count		isic
+i4b/layer1/isic/i4b_isic.c		optional	isic
 i4b/layer1/isic/i4b_isic_isa.c		optional	isic
 i4b/layer1/isic/i4b_isic_pnp.c		optional	isic
 i4b/layer1/isic/i4b_itk_ix1.c		optional	isic
@@ -300,7 +300,7 @@
 #
 # isdn4bsd, iwic
 #
-i4b/layer1/iwic/i4b_iwic_pci.c		count		iwic
+i4b/layer1/iwic/i4b_iwic_pci.c		optional	iwic
 i4b/layer1/iwic/i4b_iwic_dchan.c	optional	iwic
 i4b/layer1/iwic/i4b_iwic_bchan.c	optional	iwic
 i4b/layer1/iwic/i4b_iwic_fsm.c		optional	iwic
@@ -308,27 +308,27 @@
 #
 # isdn4bsd, ifpi
 #
-i4b/layer1/ifpi/i4b_ifpi_pci.c		count		ifpi
+i4b/layer1/ifpi/i4b_ifpi_pci.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_isac.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_l1.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_l1fsm.c	optional	ifpi
 #
 # isdn4bsd, ifpnp
 #
-i4b/layer1/ifpnp/i4b_ifpnp_avm.c	count		ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_avm.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_isac.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1.c		optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c	optional	ifpnp
 #
 # isdn4bsd, ihfc
 #
-i4b/layer1/ihfc/i4b_ihfc_l1if.c		count		ihfc
+i4b/layer1/ihfc/i4b_ihfc_l1if.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_pnp.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_drv.c		optional	ihfc
 #
 # isdn4bsd, itjc
 #
-i4b/layer1/itjc/i4b_itjc_pci.c		count		itjc
+i4b/layer1/itjc/i4b_itjc_pci.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_isac.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1fsm.c	optional	itjc
@@ -337,7 +337,7 @@
 kern/imgact_aout.c		standard
 kern/imgact_gzip.c		optional	gzip
 kern/link_aout.c		standard
-kern/subr_diskmbr.c		count		compat_atdisk
+kern/subr_diskmbr.c		optional	compat_atdisk
 libkern/divdi3.c		standard
 libkern/moddi3.c		standard
 libkern/qdivrem.c		standard
@@ -355,7 +355,7 @@
 pc98/pc98/isa_dma.c		optional	isa
 pc98/pc98/mse.c			optional	mse
 pc98/pc98/npx.c			mandatory	npx
-pc98/pc98/olpt.c		count		olpt
+pc98/pc98/olpt.c		optional	olpt
 pc98/pc98/pc98gdc.c		optional	gdc
 pc98/pc98/pc98kbd.c		optional	pckbd
 pc98/pc98/pc98_machdep.c	standard
@@ -368,8 +368,8 @@
 pc98/pc98/spkr.c		optional	speaker
 pc98/pc98/syscons.c		optional	sc
 pc98/pc98/syscons_pc98.c	optional	sc
-pc98/pc98/wd.c			count		wdc
-pc98/pc98/wd_cd.c		count		wcd wdc
-pc98/pc98/wfd.c			count		wfd wdc
-pc98/pc98/wst.c			count		wst wdc
+pc98/pc98/wd.c			optional	wdc
+pc98/pc98/wd_cd.c		optional	wcd wdc
+pc98/pc98/wfd.c			optional	wfd wdc
+pc98/pc98/wst.c			optional	wst wdc
 #pci/ide_pci.c			optional	wdc pci
Index: sys/conf/kmod.mk
===================================================================
RCS file: /home/ncvs/src/sys/conf/kmod.mk,v
retrieving revision 1.94
diff -u -r1.94 kmod.mk
--- sys/conf/kmod.mk	2001/02/20 09:37:00	1.94
+++ sys/conf/kmod.mk	2001/02/22 05:36:19
@@ -88,7 +88,6 @@
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
 
 CFLAGS+=	${COPTS} -D_KERNEL ${CWARNFLAGS}
-CFLAGS+=	-DKLD_MODULE
 
 # Don't use any standard or source-relative include directories.
 # Since -nostdinc will annull any previous -I paths, we repeat all
@@ -97,6 +96,8 @@
 _ICFLAGS:=	${CFLAGS:M-I*}
 CFLAGS+=	-nostdinc -I- ${INCLMAGIC} ${_ICFLAGS}
 
+CFLAGS+=	-I${CONFDIR} -include ${CONFDIR}/opt_global.h
+
 # Add -I paths for system headers.  Individual KLD makefiles don't
 # need any -I paths for this.  Similar defaults for .PATH can't be
 # set because there are no standard paths for non-headers.
@@ -265,7 +266,7 @@
     dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
     dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \
     dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
-    dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m
+    dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m pci/agp_if.m
 
 .for _srcsrc in ${MFILES}
 .for _ext in c h
Index: sys/conf/options
===================================================================
RCS file: /home/ncvs/src/sys/conf/options,v
retrieving revision 1.253
diff -u -r1.253 options
--- sys/conf/options	2001/02/04 15:35:08	1.253
+++ sys/conf/options	2001/02/22 05:36:19
@@ -121,11 +121,11 @@
 NTFS		opt_dontuse.h
 HPFS		opt_dontuse.h
 
-# These static filesystems has one slightly bogus static dependency in
+# These static filesystems have one slightly bogus static dependency in
 # sys/i386/i386/autoconf.c.  If any of these filesystems are
-# statically compiled into the kernel, code for mounting them as root
-# filesystems will be enabled - but look below.
+# statically compiled into the kernel, the _ROOT option can be used.
 NFS
+NFS_ROOT	opt_nfsroot.h
 
 # If you are following the conditions in the copyright,
 # you can enable soft-updates which will speed up a lot of thigs
@@ -138,12 +138,6 @@
 # as well as new file system features.
 FFS_EXTATTR	opt_ffs.h
 
-# The above static dependencies are planned removed, with a
-# <filesystem>_ROOT option to control if it usable as root.  This list
-# allows these options to be present in config files already (though
-# they won't make any difference yet).
-NFS_ROOT	opt_nfsroot.h
-
 # The union static file system has bogus static dependencies, so it isn't
 # hidden yet.
 UNION
@@ -493,3 +487,56 @@
 DEV_SNP			opt_snp.h
 DEV_MCA			opt_mca.h
 DEV_BPF			opt_bpf.h
+DEV_SMBUS		opt_smbus.h
+
+# Old/broken driver compatability
+NVCODA			vcoda.h
+NAHA			aha.h
+NBKTR			bktr.h
+NCCD			ccd.h
+NDGB			dgb.h
+NDGM			dgm.h
+NIE			ie.h
+NPCI			pci.h
+NI4BTRC			i4btrc.h
+NI4BRBCH		i4brbch.h
+NI4BTEL			i4btel.h
+NI4BIPR			i4bipr.h
+NI4BCTL			i4bctl.h
+NI4BING			i4bing.h
+NI4BISPPP		i4bisppp.h
+NI4BQ921		i4bq921.h
+NI4BQ931		i4bq931.h
+NI4B			i4b.h
+NFAITH			faith.h
+NGIF			gif.h
+NPPP			ppp.h
+NSTF			stf.h
+NVLAN			vlan.h
+NCARD			card.h
+NMETEOR			meteor.h
+NSPLASH			splash.h
+NATKBDC			atkbdc.h
+NSC			sc.h
+NASC			asc.h
+NCTX			ctx.h
+NCX			cx.h
+NCY			cy.h
+NGSC			gsc.h
+NEL			el.h
+NLE			le.h
+NRDP			rdp.h
+NWL			wl.h
+NMATCD			matcd.h
+NMCD			mcd.h
+NRC			rc.h
+NSCD			scd.h
+NSPIGOT			spigot.h
+NTW			tw.h
+NWT			wt.h
+NISIC			isic.h
+NIWIC			iwic.h
+NIFPI			ifpi.h
+NIFPNP			ifpnp.h
+NIHFC			ihfc.h
+NITJC			itjc.h
Index: sys/i386/conf/GENERIC
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/GENERIC,v
retrieving revision 1.301
diff -u -r1.301 GENERIC
--- sys/i386/conf/GENERIC	2001/02/04 15:35:08	1.301
+++ sys/i386/conf/GENERIC	2001/02/22 05:36:19
@@ -85,7 +85,8 @@
 
 device		adv		# Advansys scsi adapters
 device		adw		# Advansys wide scsi adapters
-device		aha	1	# Adaptec 154x scsi adapters
+device		aha		# Adaptec 154x scsi adapters
+options 	NAHA=1
 device		aic		# Adaptec 15[012]x scsi adapters, AIC-6[23]60.
 device		bt		# Buslogic/Mylex MultiMaster scsi adapters
 
@@ -113,7 +114,8 @@
 device		twe		# 3ware ATA RAID
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1	# At keyboard controller
+device		atkbdc		# At keyboard controller
+options 	NATKBDC=1
 device		atkbd		# at keyboard
 device		psm		# psm mouse
 
@@ -123,7 +125,8 @@
 device		splash
 
 # syscons is the default console driver, resembling an SCO console
-device		sc	1
+device		sc
+options 	NSC=1
 
 # Enable this for the pcvt (VT220 compatible) console driver
 #device		vt
@@ -205,12 +208,15 @@
 device		loop		# Network loopback
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
-device		ppp	1	# Kernel PPP
+device		ppp		# Kernel PPP
+options 	NPPP=1
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
-device		gif	4	# IPv6 and IPv4 tunneling
-device		faith	1	# IPv6-to-IPv4 relaying (translation)
+device		gif		# IPv6 and IPv4 tunneling
+options 	NGIF=4
+device		faith		# IPv6-to-IPv4 relaying (translation)
+options 	NFAITH=1
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
Index: sys/i386/conf/NOTES
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/NOTES,v
retrieving revision 1.889
diff -u -r1.889 NOTES
--- sys/i386/conf/NOTES	2001/02/07 20:18:54	1.889
+++ sys/i386/conf/NOTES	2001/02/22 05:36:19
@@ -503,17 +503,19 @@
 # See pppd(8) for more details.
 #
 device		ether			#Generic Ethernet
-device		vlan	1		#VLAN support
+device		vlan			#VLAN support
+options 	NVLAN=1
 device		token			#Generic TokenRing
 device		fddi			#Generic FDDI
 device		sppp			#Generic Synchronous PPP
-device		loop	1		#Network loopback device
+device		loop			#Network loopback device
 device		bpf			#Berkeley packet filter
 device		disc			#Discard device (ds0, ds1, etc)
 device		tap			#Virtual Ethernet driver
 device		tun			#Tunnel driver (ppp(8), nos-tun(8))
 device		sl			#Serial Line IP
-device		ppp	2		#Point-to-point protocol
+device		ppp			#Point-to-point protocol
+options 	NPPP=2
 options 	PPP_BSDCOMP		#PPP BSD-compress support
 options 	PPP_DEFLATE		#PPP zlib/deflate/gzip support
 options 	PPP_FILTER		#enable bpf filtering (needs bpf)
@@ -525,9 +527,11 @@
 options 	ETHER_SNAP		# enable Ethernet_802.2/SNAP frame
 
 # for IPv6
-device		gif	4		#IPv6 and IPv4 tunneling
+device		gif			#IPv6 and IPv4 tunneling
+options 	NGIF=4
 options 	XBONEHACK
-device		faith	1		#for IPv6 and IPv4 translation
+device		faith			#for IPv6 and IPv4 translation
+options 	NFAITH=1
 device		stf			#6to4 IPv6 over IPv4 encapsulation
 
 #
@@ -692,7 +696,7 @@
 # Extended attributes allow additional data to be associated with files,
 # and is used for ACLs, Capabilities, and MAC labels
 #
-options	FFS_EXTATTR
+options 	FFS_EXTATTR
 
 # Make space in the kernel for a root filesystem on a md device.
 # Define to the number of kilobytes to reserve for the filesystem.
@@ -744,7 +748,8 @@
 
 # Coda stuff:
 options 	CODA			#CODA filesystem.
-device		vcoda	4		#coda minicache <-> venus comm.
+device		vcoda			#coda minicache <-> venus comm.
+options 	NVCODA=4
 
 #
 # Add support for the EXT2FS filesystem of Linux fame.  Be a bit
@@ -974,7 +979,8 @@
 device		vn		#Vnode driver (turns a file into a device)
 device		md		#Memory/malloc disk
 device		snp		#Snoop device - to look at pty/vty/etc..
-device		ccd	4	#Concatenated disk driver
+device		ccd		#Concatenated disk driver
+options 	NCCD=4
 
 # Configuring Vinum into the kernel is not necessary, since the kld
 # module gets started automatically when vinum(8) starts.  This
@@ -1085,6 +1091,7 @@
 # configuration mode defined in the PCI specification.
 
 device		pci
+options 	NPCI=1
 
 #
 # AGP GART support
@@ -1109,7 +1116,8 @@
 #
 
 # The keyboard controller; it controls the keyboard and the PS/2 mouse.
-device		atkbdc	1
+device		atkbdc
+options 	NATKBDC=1
 hint.atkbdc.0.at="isa"
 hint.atkbdc.0.port="0x060"
 
@@ -1190,7 +1198,8 @@
 options 	PCVT_GREENSAVER
 
 # The syscons console driver (sco color console compatible).
-device		sc	1
+device		sc
+options 	NSC=1
 hint.sc.0.at="isa"
 options 	MAXCONS=16		# number of virtual consoles
 options 	SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
@@ -1321,7 +1330,8 @@
 device		adv
 hint.adv.0.at="isa"
 device		adw
-device		aha	1
+device		aha
+options 	NAHA=1
 hint.aha.0.at="isa"
 device		aic
 hint.aic.0.at="isa"
@@ -1696,7 +1706,7 @@
 
 # Order for ISA/EISA devices is important here
 
-device		ar	1
+device		ar
 hint.ar.0.at="isa"
 hint.ar.0.port="0x300"
 hint.ar.0.irq="10"
@@ -1704,7 +1714,8 @@
 device		cs
 hint.cs.0.at="isa"
 hint.cs.0.port="0x300"
-device		cx	1
+device		cx
+options 	NCX=1
 hint.cx.0.at="isa"
 hint.cx.0.port="0x240"
 hint.cx.0.irq="15"
@@ -1714,18 +1725,20 @@
 hint.ed.0.port="0x280"
 hint.ed.0.irq="5"
 hint.ed.0.maddr="0xd8000"
-device		el	1
+device		el
+options 	NEL=1
 hint.el.0.at="isa"
 hint.el.0.port="0x300"
 hint.el.0.irq="9"
 device		ep
 device		ex
-device		fe	1
+device		fe
 options 	FE_8BIT_SUPPORT		# LAC-98 support
 hint.fe.0.at="isa"
 hint.fe.0.port="0x300"
 device		fea
-device		ie	2
+device		ie
+options		NIE=2
 hint.ie.0.at="isa"
 hint.ie.0.port="0x300"
 hint.ie.0.irq="5"
@@ -1734,22 +1747,24 @@
 hint.ie.1.port="0x360"
 hint.ie.1.irq="7"
 hint.ie.1.maddr="0xd0000"
-device		le	1
+device		le
+options 	NLE=2
 hint.le.0.at="isa"
 hint.le.0.port="0x300"
 hint.le.0.irq="5"
 hint.le.0.maddr="0xd0000"
-device		lnc	1
+device		lnc
 hint.lnc.0.at="isa"
 hint.lnc.0.port="0x280"
 hint.lnc.0.irq="10"
 hint.lnc.0.drq="0"
-device		rdp	1
+device		rdp
+options 	NRDP=1
 hint.rdp.0.at="isa"
 hint.rdp.0.port="0x378"
 hint.rdp.0.irq="7"
 hint.rdp.0.flags="2"
-device		sr	1
+device		sr
 hint.sr.0.at="isa"
 hint.sr.0.port="0x300"
 hint.sr.0.irq="5"
@@ -1763,7 +1778,8 @@
 device		wi
 options 	WLCACHE		# enables the signal-strength cache
 options 	WLDEBUG		# enables verbose debugging output
-device		wl	1
+device		wl
+options		NWL=1
 hint.wl.0.at="isa"
 hint.wl.0.port="0x300"
 device		xe
@@ -1796,7 +1812,7 @@
 device		sk
 device		ti
 device		wx
-device		fpa	1
+device		fpa
 
 #
 # ATM related options (Cranor version)
@@ -2025,28 +2041,34 @@
 #	Brumby:                      flags 2          msize 0x4000
 #	Stallion:                    flags 1          msize 0x10000
 
-device		mcd	1
+device		mcd
+options 	NMCD=1
 hint.mcd.0.at="isa"
 hint.mcd.0.port="0x300"
 hint.mcd.0.irq="10"
 # for the Sony CDU31/33A CDROM
-device		scd	1
+device		scd
+options 	NSCD=1
 hint.scd.0.at="isa"
 hint.scd.0.port="0x230"
 # for the SoundBlaster 16 multicd - up to 4 devices
-device		matcd	1
+device		matcd
+options 	NMATCD=1
 hint.matcd.0.at="isa"
 hint.matcd.0.port="0x230"
-device		wt	1
+device		wt
+options 	NWT=1
 hint.wt.0.at="isa"
 hint.wt.0.port="0x300"
 hint.wt.0.irq="5"
 hint.wt.0.drq="1"
-device		ctx	1
+device		ctx
+options 	NCTX=1
 hint.ctx.0.at="isa"
 hint.ctx.0.port="0x230"
 hint.ctx.0.maddr="0xd0000"
-device		spigot	1
+device		spigot
+options 	NSPIGOT=1
 hint.spigot.0.at="isa"
 hint.spigot.0.port="0xad6"
 hint.spigot.0.irq="15"
@@ -2058,29 +2080,34 @@
 device		gp
 hint.gp.0.at="isa"
 hint.gp.0.port="0x2c0"
-device		gsc	1
+device		gsc
+options 	NGSC=1
 hint.gsc.0.at="isa"
 hint.gsc.0.port="0x270"
 hint.gsc.0.drq="3"
 device		joy			# PnP aware, hints for nonpnp only
 hint.joy.0.at="isa"
 hint.joy.0.port="0x201"
-device		cy	1
+device		cy
+options 	NCY=1
 options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
 hint.cy.0.at="isa"
 hint.cy.0.irq="10"
 hint.cy.0.maddr="0xd4000"
 hint.cy.0.msize="0x2000"
-device		dgb	1
+device		dgb
+options 	NDGB=1
 options 	NDGBPORTS=16		# Defaults to 16*NDGB
 hint.dgb.0.at="isa"
 hint.dgb.0.port="0x220"
 hint.dgb.0.maddr="0xfc000"
-device		dgm	1
+device		dgm
+options 	NDGM=1
 hint.dgm.0.at="isa"
 hint.dgm.0.port="0x104"
 hint.dgm.0.maddr="0xd0000"
-device		rc	1
+device		rc
+options 	NRC=1
 hint.rc.0.at="isa"
 hint.rc.0.port="0x220"
 hint.rc.0.irq="12"
@@ -2088,7 +2115,8 @@
 hint.rp.0.at="isa"
 hint.rp.0.port="0x280"
 # the port and irq for tw0 are fictitious
-device		tw	1
+device		tw
+options 	NTW=1
 hint.tw.0.at="isa"
 hint.tw.0.port="0x380"
 hint.tw.0.irq="11"
@@ -2097,7 +2125,8 @@
 hint.si.0.at="isa"
 hint.si.0.maddr="0xd0000"
 hint.si.0.irq="12"
-device		asc	1
+device		asc
+options 	NASC=1
 hint.asc.0.at="isa"
 hint.asc.0.port="0x3EB"
 hint.asc.0.drq="3"
@@ -2175,7 +2204,8 @@
 # As a rough guess, old = before 1998
 #
 
-device		meteor	1
+device		meteor
+options 	NMETEOR=1
 
 # Brooktree driver has been ported to the new I2C framework. Thus,
 # you'll need to have the following 3 lines in the kernel config.
@@ -2185,7 +2215,8 @@
 # The iic and smb devices are only needed if you want to control other
 # I2C slaves connected to the external connector of some cards.
 #
-device		bktr	1
+device		bktr
+options 	NBKTR=1
 
 #
 # PC Card/PCMCIA
@@ -2291,6 +2322,7 @@
 #	isic driver (Siemens/Infineon chipsets)
 #
 device	isic
+options NISIC=1
 #
 # ISA bus non-PnP Cards:
 # ----------------------
@@ -2373,7 +2405,7 @@
 options 	ASUSCOM_IPAC
 #
 # Eicon Diehl DIVA 2.0 and 2.02
-options       EICON_DIVA
+options 	EICON_DIVA
 #
 # PCI bus Cards:
 # --------------
@@ -2387,6 +2419,7 @@
 #
 # AVM Fritz!Card PnP
 device ifpnp
+options NIFPNP=1
 #
 #---------------------------------------------------------------------------
 #	ihfc driver for Cologne Chip ISA chipsets (experimental!)
@@ -2395,18 +2428,21 @@
 # AcerISDN P10 ISA PnP
 # TELEINT ISDN SPEED No.1
 device ihfc
+options NIHFC=1
 #
 #---------------------------------------------------------------------------
 #	ifpi driver for AVM Fritz!Card PCI
 #
 # AVM Fritz!Card PCI
 device  ifpi
+options NIFPI=1
 #
 #---------------------------------------------------------------------------
 #	iwic driver for Winbond W6692 chipset
 #
 # ASUSCOM P-IN100-ST-D (and other Winbond W6692 based cards)
 device  iwic
+options NIWIC=1
 #
 #---------------------------------------------------------------------------
 #	itjc driver for Simens ISAC / TJNet Tiger300/320 chipset
@@ -2414,39 +2450,48 @@
 # Traverse Technologies NETjet-S
 # Teles PCI-TJ
 device  itjc
+options NITJC=1
 #
 #---------------------------------------------------------------------------
 #	ISDN Protocol Stack - mandatory for all hardware drivers
 #
 # Q.921 / layer 2 - i4b passive cards D channel handling
-device		"i4bq921"
+device		i4bq921
+options 	NI4BQ921=1
 #
 # Q.931 / layer 3 - i4b passive cards D channel handling
-device		"i4bq931"
+device		i4bq931
+options 	NI4BQ931=1
 #
 # layer 4 - i4b common passive and active card handling
-device		"i4b"
+device		i4b
+options 	NI4B=1
 #
 #---------------------------------------------------------------------------
 #	ISDN devices - mandatory for all hardware drivers
 #
 # userland driver to do ISDN tracing (for passive cards only)
-device		"i4btrc"	4
+device		i4btrc
+options 	NI4BTRC=4
 #
 # userland driver to control the whole thing
-device		"i4bctl"
+device		i4bctl
+options 	NI4BCTL=1
 #
 #---------------------------------------------------------------------------
 #	ISDN devices - optional
 #
 # userland driver for access to raw B channel
-device		"i4brbch"	4
+device		i4brbch
+options 	NI4BRBCH=4
 #
 # userland driver for telephony
-device		"i4btel"	2
+device		i4btel
+options 	NI4BTEL=2
 #
 # network driver for IP over raw HDLC ISDN
-device		"i4bipr"	4
+device		i4bipr
+options 	NI4BIPR=4
 # enable VJ header compression detection for ipr i/f
 options 	IPR_VJ
 # enable logging of the first n IP packets to isdnd (n=32 here)
@@ -2454,10 +2499,12 @@
 #
 # network driver for sync PPP over ISDN; requires an equivalent
 # number of sppp device to be configured
-device		"i4bisppp"	4
+device		i4bisppp
+options 	NI4BISPPP=4
 #
 # B-channel inteface to the netgraph subsystem
-device		"i4bing"	2
+device		i4bing
+options 	NI4BING=2
 #
 #---------------------------------------------------------------------------
 
Index: sys/modules/3dfx/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/3dfx/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/3dfx/Makefile	2001/02/04 08:23:14	1.10
+++ sys/modules/3dfx/Makefile	2001/02/22 05:36:19
@@ -6,20 +6,6 @@
 
 KMOD=	3dfx
 NOMAN=	YES
-SRCS=	opt_tdfx.h  bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\
-	tdfx_vars.h tdfx_pci.c
-INCSRC=	../../sys
-
-.if ${MACHINE_ARCH} == "i386"
-# This line enables linux ioctl handling by default
-# comment out if you don't want it
-TDFX_OPTS=	"\#define TDFX_LINUX"
-.endif
-
-# Uncomment this for debugging messages
-#CFLAGS+=	-DDEBUG
-
-opt_tdfx.h:
-	echo $(TDFX_OPTS) > opt_tdfx.h
+SRCS=	tdfx_pci.h tdfx_io.h tdfx_vars.h tdfx_pci.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/aac/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/aac/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/aac/Makefile	2001/01/06 13:59:37	1.2
+++ sys/modules/aac/Makefile	2001/02/22 05:36:19
@@ -4,7 +4,6 @@
 
 KMOD=	aac
 SRCS=	aac.c aac_pci.c aac_disk.c
-SRCS+=	device_if.h bus_if.h pci_if.h
 
 CFLAGS+= -DAAC_COMPAT_LINUX
 
Index: sys/modules/acpica/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/acpica/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/modules/acpica/Makefile	2001/02/04 08:23:10	1.6
+++ sys/modules/acpica/Makefile	2001/02/22 05:36:19
@@ -37,12 +37,7 @@
 SRCS+=	acpi_resource.c acpi_thermal.c acpi_timer.c OsdDebug.c 
 SRCS+=	OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c
 SRCS+=	OsdStream.c OsdSynch.c OsdEnvironment.c 
-SRCS+=	opt_acpi.h opt_ddb.h
-SRCS+=	device_if.h bus_if.h pci_if.h pcib_if.h isa_if.h
 
 CFLAGS+=   -I${.CURDIR}/../../contrib/dev/acpica/Subsystem/Include
-
-opt_ddb.h: Makefile
-	echo '#define DDB 1'  >opt_ddb.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/agp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/agp/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/modules/agp/Makefile	2001/01/06 13:59:39	1.6
+++ sys/modules/agp/Makefile	2001/02/22 05:36:19
@@ -5,8 +5,5 @@
 KMOD=	agp
 SRCS=	agp.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c
 SRCS+=	agp_i810.c agp_if.c
-SRCS+=	device_if.h bus_if.h agp_if.h pci_if.h
-SRCS+=	opt_bdg.h opt_bus.h opt_pci.h
-MFILES=	kern/device_if.m kern/bus_if.m pci/agp_if.m dev/pci/pci_if.m
 
 .include <bsd.kmod.mk>
Index: sys/modules/aha/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/aha/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- sys/modules/aha/Makefile	2001/02/04 16:45:39	1.8
+++ sys/modules/aha/Makefile	2001/02/22 05:36:19
@@ -3,10 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/aha
 
 KMOD=	aha
-SRCS=	aha.c aha_isa.c ahareg.h opt_cam.h device_if.h bus_if.h \
-	opt_scsi.h isa_if.h
-
-opt_scsi.h:
-	echo "#define SCSI_DELAY 15000" > opt_scsi.h
+SRCS=	aha.c aha_isa.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/aic/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/aic/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sys/modules/aic/Makefile	2001/01/08 01:59:15	1.4
+++ sys/modules/aic/Makefile	2001/02/22 05:36:19
@@ -4,8 +4,6 @@
 
 KMOD=	aic
 SRCS=	aic.c aic_pccard.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h
-SRCS+=	opt_cam.h opt_scsi.h
 
 .if ${MACHINE} == "pc98"
 SRCS+=	aic_cbus.c
Index: sys/modules/amr/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/amr/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- sys/modules/amr/Makefile	2001/01/06 13:59:40	1.8
+++ sys/modules/amr/Makefile	2001/02/22 05:36:19
@@ -3,11 +3,11 @@
 .PATH: ${.CURDIR}/../../dev/amr
 
 KMOD=	amr
-SRCS=	amr.c amr_pci.c amr_disk.c device_if.h bus_if.h pci_if.h
+SRCS=	amr.c amr_pci.c amr_disk.c
 
 # SCSI passthrough support for non-disk devices
 #CFLAGS+= -DAMR_SCSI_PASSTHROUGH
-#SRCS+=	amr_cam.c opt_cam.h opt_scsi.h
+#SRCS+=	amr_cam.c
 
 # Enable a questionable optimisation for newer adapters
 #CFLAGS+= -DAMR_QUARTZ_GOFASTER
Index: sys/modules/an/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/an/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/modules/an/Makefile	2001/01/06 13:59:40	1.5
+++ sys/modules/an/Makefile	2001/02/22 05:36:19
@@ -4,9 +4,5 @@
 
 KMOD=	if_an
 SRCS=	if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c
-SRCS+=	opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h
-
-opt_inet.h:
-	echo "#define INET 1" > opt_inet.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/ar/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ar/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/ar/Makefile	2001/02/04 08:23:11	1.2
+++ sys/modules/ar/Makefile	2001/02/22 05:36:19
@@ -3,6 +3,5 @@
 .PATH:  ${.CURDIR}/../../dev/ar
 KMOD    = if_ar
 SRCS    = if_ar.c if_ar_pci.c
-SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
   
 .include <bsd.kmod.mk>
Index: sys/modules/asr/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/asr/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/asr/Makefile	2001/01/06 13:59:40	1.2
+++ sys/modules/asr/Makefile	2001/02/22 05:36:19
@@ -4,7 +4,5 @@
 
 KMOD=	asr
 SRCS=	asr.c
-SRCS+=	opt_scsi.h opt_cam.h opt_asr.h
-SRCS+=	device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/atspeaker/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/atspeaker/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/atspeaker/Makefile	2001/02/08 13:24:30	1.2
+++ sys/modules/atspeaker/Makefile	2001/02/22 05:36:19
@@ -9,6 +9,5 @@
 
 KMOD=	atspeaker
 SRCS=	spkr.c
-SRCS+=	bus_if.h device_if.h isa_if.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/aue/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/aue/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/modules/aue/Makefile	2001/01/06 13:59:40	1.6
+++ sys/modules/aue/Makefile	2001/02/22 05:36:19
@@ -4,7 +4,6 @@
 .PATH: $S/dev/usb
 
 KMOD=	if_aue
-SRCS=	if_aue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_aue.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/bktr/bktr/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/bktr/bktr/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/bktr/bktr/Makefile	2001/01/06 13:59:41	1.2
+++ sys/modules/bktr/bktr/Makefile	2001/02/22 05:36:19
@@ -6,8 +6,7 @@
 
 KMOD=	bktr 
 SRCS=	bktr_core.c bktr_os.c bktr_audio.c bktr_tuner.c bktr_card.c \
-	bktr.h opt_devfs.h opt_bktr.h smbus.h bus_if.h device_if.h \
-	pci_if.h vnode_if.h
+	bktr.h smbus.h
 CLEANFILES= bktr.h smbus.h
 
 bktr.h:
Index: sys/modules/cam/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/cam/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/cam/Makefile	2001/02/10 12:52:56	1.3
+++ sys/modules/cam/Makefile	2001/02/22 05:36:19
@@ -11,15 +11,6 @@
 CFLAGS+= -DPC98
 .endif
 
-# See sys/conf/options for the flags that go into the different opt_*.h files.
-SRCS=	opt_cam.h
-SRCS+=	opt_scsi.h
-SRCS+=	opt_cd.h
-SRCS+=	opt_hw_wdog.h
-SRCS+=	opt_pt.h
-SRCS+=	opt_sa.h
-SRCS+=	opt_ses.h
-SRCS+=	device_if.h bus_if.h
 SRCS+=	cam.c cam_extend.c cam_periph.c cam_queue.c
 SRCS+=	cam_sim.c cam_xpt.c
 SRCS+=	scsi_all.c scsi_cd.c scsi_ch.c
@@ -31,8 +22,5 @@
 SRCS+=	scsi_targ_bh.c scsi_target.c
 
 NOMAN=
-
-opt_scsi.h:
-	echo '#define SCSI_DELAY 15000' > opt_scsi.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/cardbus/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/cardbus/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- sys/modules/cardbus/Makefile	2001/01/06 13:59:42	1.7
+++ sys/modules/cardbus/Makefile	2001/02/22 05:36:19
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/cardbus
 
 KMOD=	cardbus
-SRCS=	cardbus.c cardbus_cis.c \
-	device_if.h bus_if.h card_if.h power_if.h pci_if.h pcib_if.h
+SRCS=	cardbus.c cardbus_cis.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/cbb/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/cbb/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/modules/cbb/Makefile	2001/01/06 13:59:42	1.5
+++ sys/modules/cbb/Makefile	2001/02/22 05:36:19
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	cbb
-SRCS=	pccbb.c \
-	device_if.h bus_if.h
+SRCS=	pccbb.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/ccd/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ccd/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- sys/modules/ccd/Makefile	2001/01/06 13:59:42	1.14
+++ sys/modules/ccd/Makefile	2001/02/22 05:36:19
@@ -3,13 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/ccd
 
 KMOD=	ccd
-SRCS=	ccd.c ccd.h vnode_if.h
+SRCS=	ccd.c
 NOMAN=
-
-NCCD?=		4
-CLEANFILES=	ccd.h
-
-ccd.h:
-	echo "#define NCCD ${NCCD}" > ccd.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/cd9660/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/cd9660/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- sys/modules/cd9660/Makefile	2001/01/06 13:59:43	1.12
+++ sys/modules/cd9660/Makefile	2001/02/22 05:36:19
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../isofs/cd9660
 
 KMOD=	cd9660
-SRCS=	vnode_if.h \
-	cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
+SRCS=	cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
 	cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
 NOMAN=
 
Index: sys/modules/coda/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/coda/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- sys/modules/coda/Makefile	2001/01/06 13:59:43	1.11
+++ sys/modules/coda/Makefile	2001/02/22 05:36:19
@@ -3,14 +3,8 @@
 .PATH: ${.CURDIR}/../../coda
 
 KMOD=	coda
-SRCS=	vnode_if.h \
-	coda_fbsd.c coda_namecache.c coda_psdev.c coda_subr.c \
-	coda_venus.c coda_vfsops.c coda_vnops.c vcoda.h
+SRCS=	coda_fbsd.c coda_namecache.c coda_psdev.c coda_subr.c \
+	coda_venus.c coda_vfsops.c coda_vnops.c
 NOMAN=
-
-CLEANFILES=	vcoda.h
-
-vcoda.h:
-	echo "#define NVCODA 4" > vcoda.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/coff/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/coff/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- sys/modules/coff/Makefile	2001/01/06 13:59:43	1.14
+++ sys/modules/coff/Makefile	2001/02/22 05:36:19
@@ -3,9 +3,7 @@
 .PATH: ${.CURDIR}/../../i386/ibcs2
 
 KMOD=	ibcs2_coff
-SRCS= 	imgact_coff.c vnode_if.h
+SRCS= 	imgact_coff.c
 NOMAN=
-
-CFLAGS+=	-DCOMPAT_IBCS2
 
 .include <bsd.kmod.mk>
Index: sys/modules/cue/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/cue/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/modules/cue/Makefile	2001/01/06 13:59:43	1.5
+++ sys/modules/cue/Makefile	2001/02/22 05:36:19
@@ -4,7 +4,6 @@
 .PATH: $S/dev/usb
 
 KMOD=	if_cue
-SRCS=	if_cue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_cue.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/dc/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/dc/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/modules/dc/Makefile	2001/01/06 13:59:44	1.6
+++ sys/modules/dc/Makefile	2001/02/22 05:36:19
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_dc
-SRCS=	if_dc.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_dc.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/de/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/de/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/de/Makefile	2001/01/06 13:59:44	1.2
+++ sys/modules/de/Makefile	2001/02/22 05:36:19
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_de
-SRCS=	if_de.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_de.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/ed/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ed/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sys/modules/ed/Makefile	2001/01/06 13:59:44	1.4
+++ sys/modules/ed/Makefile	2001/02/22 05:36:19
@@ -12,6 +12,4 @@
 SRCS+=	if_ed_isa.c
 .endif
 
-SRCS+=	opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h
-
 .include <bsd.kmod.mk>
Index: sys/modules/el/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/el/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/el/Makefile	2001/01/06 13:59:45	1.2
+++ sys/modules/el/Makefile	2001/02/22 05:36:19
@@ -4,6 +4,5 @@
 
 KMOD=	if_el
 SRCS=	if_el.c
-SRCS+=	opt_bdg.h opt_inet.h opt_ipx.h device_if.h bus_if.h isa_if.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/ep/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ep/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/ep/Makefile	2001/01/06 13:59:45	1.3
+++ sys/modules/ep/Makefile	2001/02/22 05:36:19
@@ -8,7 +8,6 @@
 SRCS+=	if_ep_isa.c
 #SRCS+=	if_ep_eisa.c
 #SRCS+=	if_ep_mca.c
-SRCS+=	opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h
 
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
Index: sys/modules/fdesc/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/fdesc/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/fdesc/Makefile	2001/01/06 13:59:45	1.10
+++ sys/modules/fdesc/Makefile	2001/02/22 05:36:19
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../miscfs/fdesc
 
 KMOD=	fdesc
-SRCS=	vnode_if.h \
-	fdesc_vfsops.c fdesc_vnops.c
+SRCS=	fdesc_vfsops.c fdesc_vnops.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/fxp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/fxp/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- sys/modules/fxp/Makefile	2001/01/06 13:59:46	1.12
+++ sys/modules/fxp/Makefile	2001/02/22 05:36:19
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_fxp
-SRCS=	if_fxp.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_fxp.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/hpfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/hpfs/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/modules/hpfs/Makefile	2001/01/06 13:59:46	1.6
+++ sys/modules/hpfs/Makefile	2001/02/22 05:36:19
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../fs/hpfs
 
 KMOD=	hpfs
-SRCS=	vnode_if.h \
-	hpfs_vfsops.c hpfs_vnops.c hpfs_hash.c hpfs_subr.c hpfs_lookup.c \
+SRCS=	hpfs_vfsops.c hpfs_vnops.c hpfs_hash.c hpfs_subr.c hpfs_lookup.c \
 	hpfs_alsubr.c
 NOMAN=
 
Index: sys/modules/ibcs2/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ibcs2/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- sys/modules/ibcs2/Makefile	2001/02/04 10:52:24	1.33
+++ sys/modules/ibcs2/Makefile	2001/02/22 05:36:19
@@ -7,9 +7,6 @@
 	ibcs2_fcntl.c ibcs2_signal.c ibcs2_sysent.c ibcs2_ioctl.c \
 	ibcs2_socksys.c ibcs2_util.c ibcs2_xenix.c ibcs2_xenix_sysent.c \
 	ibcs2_isc.c ibcs2_isc_sysent.c \
-	ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c \
-	vnode_if.h opt_spx_hack.h
-
-CFLAGS+= -DCOMPAT_IBCS2
+	ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/if_disc/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_disc/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- sys/modules/if_disc/Makefile	2001/01/06 13:59:47	1.16
+++ sys/modules/if_disc/Makefile	2001/02/22 05:36:19
@@ -3,13 +3,7 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_disc
-SRCS=	if_disc.c opt_inet.h opt_inet6.h
+SRCS=	if_disc.c
 NOMAN=
-
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-#opt_inet6.h:
-#	echo "#define INET6 1" > ${.TARGET}
 
 .include <bsd.kmod.mk>
Index: sys/modules/if_ef/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_ef/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sys/modules/if_ef/Makefile	2001/01/06 13:59:47	1.9
+++ sys/modules/if_ef/Makefile	2001/02/22 05:36:19
@@ -3,32 +3,8 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_ef
-SRCS=	if_ef.c opt_ipx.h opt_inet.h opt_ef.h
+SRCS=	if_ef.c
 NOMAN=
-
-# If you need only limited number of frames comment out unneeded ones
-# this will reduce number of visible devices
-ETHER_II=
-ETHER_8023=
-ETHER_8022=
-ETHER_SNAP=
-
-.if defined(EFDEBUG)
-CFLAGS+= -DEF_DEBUG
-.endif
-
-opt_inet.h:
-	echo "#define INET 1" > opt_inet.h
-
-opt_ipx.h:
-	echo "#define IPX 1" > opt_ipx.h
-
-opt_ef.h:
-.for frame in ETHER_II ETHER_8023 ETHER_8022 ETHER_SNAP
-.if defined(${frame})
-	echo "#define ${frame} 1" >> opt_ef.h
-.endif
-.endfor
 
 load: all
 	/sbin/kldload ./${PROG}
Index: sys/modules/if_ppp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_ppp/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- sys/modules/if_ppp/Makefile	2001/02/04 08:23:11	1.28
+++ sys/modules/if_ppp/Makefile	2001/02/22 05:36:19
@@ -3,49 +3,9 @@
 .PATH:  ${.CURDIR}/../../net
 
 KMOD=	if_ppp
-SRCS=	if_ppp.c ppp_tty.c slcompress.c \
-	opt_inet.h opt_ipx.h opt_ppp.h ppp.h vnode_if.h
-NOMAN=
-
-NPPP?=		2
-PPP_BSDCOMP?=	1	# 0/1
-PPP_DEFLATE?=	1	# 0/1
-PPP_FILTER?=	1	# 0/1 - requires bpf to be configured in kernel
-PPP_INET?=	1	# 0/1 - requires INET to be configured in kernel
-PPP_IPX?=	0	# 0/1 - requires IPX to be configured in kernel
-
-.if ${PPP_BSDCOMP} > 0
+SRCS=	if_ppp.c ppp_tty.c slcompress.c
 SRCS+=	bsd_comp.c
-.endif
-.if ${PPP_DEFLATE} > 0
 SRCS+=	ppp_deflate.c zlib.c
-.endif
-
-CLEANFILES=	ppp.h
-
-.if ${PPP_INET} > 0
-opt_inet.h:
-	echo "#define INET 1" >> ${.TARGET}
-.endif
-
-.if ${PPP_IPX} > 0
-opt_ipx.h:
-	echo "#define IPX ${PPP_IPX}" >> ${.TARGET}
-.endif
-
-opt_ppp.h:
-	touch ${.TARGET}
-.if ${PPP_BSDCOMP} > 0
-	echo "#define PPP_BSDCOMP ${PPP_BSDCOMP}" >> ${.TARGET}
-.endif
-.if ${PPP_DEFLATE} > 0
-	echo "#define PPP_DEFLATE ${PPP_DEFLATE}" >> ${.TARGET}
-.endif
-.if ${PPP_FILTER} > 0
-	echo "#define PPP_FILTER ${PPP_FILTER}" >> ${.TARGET}
-.endif
-
-ppp.h:
-	echo "#define NPPP ${NPPP}" > ${.TARGET}
+NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/if_sl/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_sl/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- sys/modules/if_sl/Makefile	2001/01/06 13:59:50	1.18
+++ sys/modules/if_sl/Makefile	2001/02/22 05:36:19
@@ -3,10 +3,7 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_sl
-SRCS=	if_sl.c slcompress.c opt_inet.h opt_slip.h
+SRCS=	if_sl.c slcompress.c
 NOMAN=
-
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
 
 .include <bsd.kmod.mk>
Index: sys/modules/if_tap/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_tap/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/if_tap/Makefile	2001/01/06 13:59:50	1.3
+++ sys/modules/if_tap/Makefile	2001/02/22 05:36:19
@@ -5,11 +5,6 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_tap
-SRCS=	if_tap.c opt_inet.h vnode_if.h
-
-CLEANFILES+=	opt_devfs.h opt_inet.h vnode_if.h
-
-opt_inet.h:
-	echo "#define INET 1" > opt_inet.h
+SRCS=	if_tap.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/if_tun/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_tun/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- sys/modules/if_tun/Makefile	2001/01/06 13:59:51	1.24
+++ sys/modules/if_tun/Makefile	2001/02/22 05:36:19
@@ -3,10 +3,7 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_tun
-SRCS=	if_tun.c opt_inet.h vnode_if.h
+SRCS=	if_tun.c
 NOMAN=
-
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
 
 .include <bsd.kmod.mk>
Index: sys/modules/joy/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/joy/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- sys/modules/joy/Makefile	2001/01/06 13:59:53	1.21
+++ sys/modules/joy/Makefile	2001/02/22 05:36:19
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../isa
 
 KMOD=	joy
-SRCS=	bus_if.h device_if.h isa_if.h joy.c
+SRCS=	joy.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/kue/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/kue/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/modules/kue/Makefile	2001/01/06 13:59:53	1.5
+++ sys/modules/kue/Makefile	2001/02/22 05:36:19
@@ -4,7 +4,6 @@
 .PATH: $S/dev/usb
 
 KMOD=	if_kue
-SRCS=	if_kue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_kue.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/linprocfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/linprocfs/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/modules/linprocfs/Makefile	2001/01/06 13:59:53	1.6
+++ sys/modules/linprocfs/Makefile	2001/02/22 05:36:19
@@ -3,12 +3,9 @@
 .PATH: ${.CURDIR}/../../compat/linprocfs
 
 KMOD=	linprocfs
-SRCS=	vnode_if.h linprocfs_misc.c linprocfs_subr.c \
+SRCS=	linprocfs_misc.c linprocfs_subr.c \
 	linprocfs_vfsops.c linprocfs_vnops.c
 NOMAN=
-VFS_KLD=
-
-CFLAGS+= -DLINPROCFS
 
 test: unload install load
 
Index: sys/modules/linux/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/linux/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- sys/modules/linux/Makefile	2001/02/04 10:52:24	1.51
+++ sys/modules/linux/Makefile	2001/02/22 05:36:19
@@ -7,8 +7,7 @@
 KMOD=	linux
 SRCS=	linux_file.c linux_ioctl.c linux_ipc.c linux_machdep.c linux_misc.c \
 	linux_signal.c linux_socket.c linux_stats.c linux_mib.c \
-	linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c \
-	opt_compat.h opt_linux.h opt_vmpage.h vnode_if.h
+	linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c
 OBJS=	linux_locore.o
 
 .if ${MACHINE_ARCH} == "i386"
@@ -29,8 +28,5 @@
 
 linux_genassym.o: linux_genassym.c linux.h @ machine
 	${CC} -c ${CFLAGS} ${.IMPSRC}
-
-opt_compat.h:
-	echo "#define COMPAT_43 1" > opt_compat.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/lnc/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/lnc/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sys/modules/lnc/Makefile	2001/02/04 12:35:21	1.4
+++ sys/modules/lnc/Makefile	2001/02/22 05:36:19
@@ -4,8 +4,6 @@
 
 KMOD=	if_lnc
 SRCS=	if_lnc.c if_lnc_pci.c if_lnc_isa.c if_lnc_pc98.c
-SRCS+=	opt_inet.h device_if.h bus_if.h isa_if.h pci_if.h
-#SRCS+=	miibus_if.h
 
 CFLAGS+= -g -I${.CURDIR}/../../dev/lnc
 
Index: sys/modules/md/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/md/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sys/modules/md/Makefile	2001/01/06 13:59:54	1.9
+++ sys/modules/md/Makefile	2001/02/22 05:36:19
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/md
 
 KMOD=	md
-SRCS=	md.c opt_mfs.h opt_md.h vnode_if.h
+SRCS=	md.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/mfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/mfs/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- sys/modules/mfs/Makefile	2001/01/06 13:59:55	1.11
+++ sys/modules/mfs/Makefile	2001/02/22 05:36:19
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../ufs/mfs
 
 KMOD=	mfs
-SRCS=	vnode_if.h \
-	mfs_vfsops.c mfs_vnops.c opt_mfs.h
+SRCS=	mfs_vfsops.c mfs_vnops.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/mii/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/mii/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- sys/modules/mii/Makefile	2001/02/07 19:57:40	1.17
+++ sys/modules/mii/Makefile	2001/02/22 05:36:19
@@ -3,8 +3,8 @@
 .PATH: ${.CURDIR}/../../dev/mii
 
 KMOD=	miibus
-SRCS=	mii.c mii_physubr.c ukphy.c ukphy_subr.c bus_if.h pci_if.h
-SRCS+=	miibus_if.h device_if.h miibus_if.c exphy.c nsphy.c
+SRCS=	mii.c mii_physubr.c ukphy.c ukphy_subr.c
+SRCS+=	miibus_if.c exphy.c nsphy.c
 SRCS+=	mlphy.c tlphy.c rlphy.c amphy.c dcphy.c pnphy.c
 SRCS+=	brgphy.c xmphy.c pnaphy.c lxtphy.c qsphy.c acphy.c
 
Index: sys/modules/mlx/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/mlx/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- sys/modules/mlx/Makefile	2001/01/06 13:59:55	1.7
+++ sys/modules/mlx/Makefile	2001/02/22 05:36:19
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/mlx
 
 KMOD=	mlx
-SRCS=	mlx.c mlx_pci.c mlx_disk.c device_if.h bus_if.h pci_if.h
+SRCS=	mlx.c mlx_pci.c mlx_disk.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/mly/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/mly/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/mly/Makefile	2001/01/06 13:59:55	1.2
+++ sys/modules/mly/Makefile	2001/02/22 05:36:19
@@ -4,8 +4,6 @@
 
 KMOD=	mly
 SRCS=	mly.c mly_pci.c mly_cam.c
-SRCS+=	opt_scsi.h opt_cam.h
-SRCS+=	device_if.h bus_if.h pci_if.h
 
 #CFLAGS+=	-DMLY_DEBUG=1
 
Index: sys/modules/msdos/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/msdos/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- sys/modules/msdos/Makefile	2001/01/06 13:59:56	1.14
+++ sys/modules/msdos/Makefile	2001/02/22 05:36:19
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../msdosfs
 
 KMOD=	msdos
-SRCS=	vnode_if.h \
-	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
+SRCS=	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
 	msdosfs_vfsops.c msdosfs_vnops.c
 NOMAN=
 
Index: sys/modules/ncp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ncp/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- sys/modules/ncp/Makefile	2001/02/04 08:23:11	1.7
+++ sys/modules/ncp/Makefile	2001/02/22 05:36:19
@@ -11,7 +11,7 @@
 NCP_INET?=	1
 
 SRCS=	ncp_conn.c ncp_sock.c ncp_ncp.c ncp_subr.c ncp_crypt.c ncp_mod.c \
-	ncp_rq.c ncp_login.c ncp_nls.c opt_inet.h opt_ipx.h opt_ncp.h
+	ncp_rq.c ncp_login.c ncp_nls.c
 
 .if defined(NCPBURST)
 SRCS+=	ncp_burst.c
@@ -19,16 +19,6 @@
 .endif
 
 NOMAN=
-
-.if ${NCP_INET} > 0
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${NCP_IPX} > 0
-opt_ipx.h:
-	echo "#define IPX 1" > ${.TARGET}
-.endif
 
 load: ${KMOD}.ko
 	kldload ./${KMOD}.ko
Index: sys/modules/netgraph/mppc/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/netgraph/mppc/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/netgraph/mppc/Makefile	2001/01/06 14:00:00	1.10
+++ sys/modules/netgraph/mppc/Makefile	2001/02/22 05:36:19
@@ -2,7 +2,7 @@
 # $FreeBSD: src/sys/modules/netgraph/mppc/Makefile,v 1.10 2001/01/06 14:00:00 obrien Exp $
 
 KMOD=	ng_mppc
-SRCS= 	ng_mppc.c opt_netgraph.h
+SRCS= 	ng_mppc.c
 NOMAN=
 
 NETGRAPH_MPPC_COMPRESSION?=	0
@@ -18,15 +18,6 @@
 .PATH: ${.CURDIR}/../../../crypto
 .PATH: ${.CURDIR}/../../../crypto/rc4
 SRCS+=	rc4.c sha1.c
-.endif
-
-opt_netgraph.h:
-	touch ${.TARGET}
-.if ${NETGRAPH_MPPC_COMPRESSION} > 0
-	echo "#define NETGRAPH_MPPC_COMPRESSION 1" >> ${.TARGET}
-.endif
-.if ${NETGRAPH_MPPC_ENCRYPTION} > 0
-	echo "#define NETGRAPH_MPPC_ENCRYPTION 1" >> ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>
Index: sys/modules/netgraph/sync_ar/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/netgraph/sync_ar/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/modules/netgraph/sync_ar/Makefile	2001/01/30 10:20:42	1.1
+++ sys/modules/netgraph/sync_ar/Makefile	2001/02/22 05:36:20
@@ -3,9 +3,5 @@
 .PATH:  ${.CURDIR}/../../../dev/ar
 KMOD    = ng_sync_ar
 SRCS    = if_ar.c if_ar_pci.c
-SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
   
-opt_netgraph.h:
-	echo "#define NETGRAPH" > opt_netgraph.h
-
 .include <bsd.kmod.mk>
Index: sys/modules/netgraph/sync_sr/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/netgraph/sync_sr/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/modules/netgraph/sync_sr/Makefile	2001/01/30 10:20:42	1.1
+++ sys/modules/netgraph/sync_sr/Makefile	2001/02/22 05:36:20
@@ -3,9 +3,5 @@
 .PATH:  ${.CURDIR}/../../../dev/sr
 KMOD    = ng_sync_sr
 SRCS    = if_sr.c if_sr_isa.c if_sr_pci.c
-SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
-  
-opt_netgraph.h:
-	echo "#define NETGRAPH" > opt_netgraph.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/netgraph/tty/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/netgraph/tty/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/netgraph/tty/Makefile	2001/01/06 14:00:04	1.10
+++ sys/modules/netgraph/tty/Makefile	2001/02/22 05:36:20
@@ -2,8 +2,7 @@
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_tty
-SRCS= 	ng_tty.c device_if.h bus_if.h pci_if.h
-MFILES=	kern/device_if.m kern/bus_if.m pci/agp_if.m dev/pci/pci_if.m
+SRCS= 	ng_tty.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/nfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/nfs/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- sys/modules/nfs/Makefile	2001/02/04 08:23:12	1.20
+++ sys/modules/nfs/Makefile	2001/02/22 05:36:20
@@ -3,16 +3,9 @@
 .PATH: ${.CURDIR}/../../nfs
 
 KMOD=	nfs
-SRCS=	vnode_if.h \
-	nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
+SRCS=	nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
 	nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
-	nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h opt_bootp.h
-NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
+	nfs_vnops.c
 NOMAN=
-
-.if ${NFS_INET} > 0
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
 
 .include <bsd.kmod.mk>
Index: sys/modules/ntfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ntfs/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- sys/modules/ntfs/Makefile	2001/01/06 14:00:08	1.8
+++ sys/modules/ntfs/Makefile	2001/02/22 05:36:20
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../ntfs
 
 KMOD=	ntfs
-SRCS=	vnode_if.h \
-	ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \
+SRCS=	ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \
 	ntfs_compr.c
 NOMAN=
 
Index: sys/modules/nullfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/nullfs/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- sys/modules/nullfs/Makefile	2001/01/06 14:00:08	1.14
+++ sys/modules/nullfs/Makefile	2001/02/22 05:36:20
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../miscfs/nullfs
 
 KMOD=	nullfs
-SRCS=	vnode_if.h \
-	null_subr.c null_vfsops.c null_vnops.c
+SRCS=	null_subr.c null_vfsops.c null_vnops.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/nwfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/nwfs/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sys/modules/nwfs/Makefile	2001/01/06 14:00:08	1.9
+++ sys/modules/nwfs/Makefile	2001/02/22 05:36:20
@@ -4,18 +4,14 @@
 
 KMOD=	nwfs
 
-SRCS=	vnode_if.h \
-	nwfs_node.c nwfs_ioctl.c nwfs_io.c nwfs_vfsops.c nwfs_vnops.c \
-	nwfs_subr.c opt_ncp.h opt_nwfs.h opt_vmpage.h
+SRCS=	nwfs_node.c nwfs_ioctl.c nwfs_io.c nwfs_vfsops.c nwfs_vnops.c \
+	nwfs_subr.c
 
 NOMAN=	true
 
 .if defined(VNPRINT)
 CFLAGS+= -DVNPRINT
 .endif
-
-opt_ncp.h:
-	echo "#define NCP	1"  > ${.TARGET}
 
 load: nwfs.ko
 	kldload ./nwfs.ko
Index: sys/modules/oldcard/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/oldcard/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/modules/oldcard/Makefile	2001/02/04 08:23:12	1.5
+++ sys/modules/oldcard/Makefile	2001/02/22 05:36:20
@@ -4,8 +4,7 @@
 
 KMOD=	oldcard
 SRCS=	pccard.c pcic.c pccard_beep.c pccard_nbk.c pcic_p.c \
-	opt_pcic.h device_if.h bus_if.h isa_if.h pci_if.h \
-	power_if.h card_if.h power_if.c card_if.c
+	power_if.c card_if.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/osf1/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/osf1/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- sys/modules/osf1/Makefile	2001/02/04 10:52:24	1.8
+++ sys/modules/osf1/Makefile	2001/02/22 05:36:20
@@ -6,12 +6,8 @@
 
 KMOD=	osf1
 SRCS=	osf1_ioctl.c osf1_misc.c osf1_signal.c osf1_sysent.c \
-	osf1_mount.c imgact_osf1.c osf1_sysvec.c opt_compat.h \
-	opt_simos.h opt_nfs.h device_if.h bus_if.h vnode_if.h
+	osf1_mount.c imgact_osf1.c osf1_sysvec.c
 
 #CFLAGS+=  -g
-
-opt_compat.h:
-	echo "#define COMPAT_43 1" > ${.TARGET}
 
 .include <bsd.kmod.mk>
Index: sys/modules/pccard/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/pccard/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- sys/modules/pccard/Makefile	2001/01/06 14:00:09	1.7
+++ sys/modules/pccard/Makefile	2001/02/22 05:36:20
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/pccard
 
 KMOD=	pccard
-SRCS=	pccard.c pccard_cis.c pccard_cis_quirks.c \
-	device_if.h bus_if.h card_if.h power_if.h
+SRCS=	pccard.c pccard_cis.c pccard_cis_quirks.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/pccbb/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/pccbb/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/pccbb/Makefile	2001/01/06 14:00:09	1.2
+++ sys/modules/pccbb/Makefile	2001/02/22 05:36:20
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/pccbb
 
 KMOD=	pccbb
-SRCS=	pccbb.c \
-	device_if.h bus_if.h power_if.h card_if.h pci_if.h pcib_if.h
+SRCS=	pccbb.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/pcfclock/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/pcfclock/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sys/modules/pcfclock/Makefile	2001/01/06 14:00:10	1.4
+++ sys/modules/pcfclock/Makefile	2001/02/22 05:36:20
@@ -3,7 +3,6 @@
 .PATH:	${.CURDIR}/../../dev/ppbus
 
 KMOD=	pcfclock
-SRCS=	pcfclock.c opt_pcfclock.h
-SRCS+=	bus_if.h device_if.h ppbus_if.h
+SRCS=	pcfclock.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/pcic/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/pcic/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- sys/modules/pcic/Makefile	2001/01/06 14:00:10	1.21
+++ sys/modules/pcic/Makefile	2001/02/22 05:36:20
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/pcic ${.CURDIR}/../../dev/pccard
 
 KMOD=	pcic
-SRCS=	i82365.c i82365_isa.c device_if.h bus_if.h isa_if.h \
-	power_if.h card_if.h power_if.c card_if.c
+SRCS=	i82365.c i82365_isa.c power_if.c card_if.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/pcn/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/pcn/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/pcn/Makefile	2001/01/06 14:00:10	1.2
+++ sys/modules/pcn/Makefile	2001/02/22 05:36:20
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_pcn
-SRCS=	if_pcn.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_pcn.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/pecoff/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/pecoff/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/pecoff/Makefile	2001/02/04 08:23:13	1.3
+++ sys/modules/pecoff/Makefile	2001/02/22 05:36:20
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../compat/pecoff
 
 KMOD=	pecoff
-SRCS=	imgact_pecoff.c opt_pecoff.h vnode_if.h
+SRCS=	imgact_pecoff.c
 
 CFLAGS+= -g -DDEBUG
 
Index: sys/modules/portal/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/portal/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/portal/Makefile	2001/01/06 14:00:11	1.10
+++ sys/modules/portal/Makefile	2001/02/22 05:36:20
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../miscfs/portal
 
 KMOD=	portal
-SRCS=	vnode_if.h \
-	portal_vfsops.c portal_vnops.c
+SRCS=	portal_vfsops.c portal_vnops.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/procfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/procfs/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- sys/modules/procfs/Makefile	2001/01/06 14:00:11	1.22
+++ sys/modules/procfs/Makefile	2001/02/22 05:36:20
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../miscfs/procfs
 
 KMOD=	procfs
-SRCS=	vnode_if.h \
-	procfs_ctl.c \
+SRCS=	procfs_ctl.c \
 	procfs_dbregs.c \
 	procfs_fpregs.c \
 	procfs_map.c \
Index: sys/modules/random/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/random/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/random/Makefile	2001/01/15 19:35:00	1.10
+++ sys/modules/random/Makefile	2001/02/22 05:36:20
@@ -6,7 +6,6 @@
 KMOD=	random
 SRCS=	randomdev.c yarrow.c hash.c
 SRCS+=	bf_cbc.c bf_skey.c bf_enc.c
-SRCS+=	bus_if.h device_if.h vnode_if.h
 NOMAN=	yes
 
 CFLAGS+= -I${.CURDIR}/../..
Index: sys/modules/ray/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ray/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/ray/Makefile	2001/01/06 14:00:12	1.2
+++ sys/modules/ray/Makefile	2001/02/22 05:36:20
@@ -4,7 +4,6 @@
 
 KMOD=	if_ray
 SRCS=	if_ray.c
-SRCS+=	device_if.h bus_if.h card_if.h opt_inet.h
 NOMAN= 
 
 .include <bsd.kmod.mk>
Index: sys/modules/rl/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/rl/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/rl/Makefile	2001/01/06 14:00:13	1.10
+++ sys/modules/rl/Makefile	2001/02/22 05:36:20
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_rl
-SRCS=	if_rl.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_rl.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/rp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/rp/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/rp/Makefile	2001/01/06 14:00:13	1.2
+++ sys/modules/rp/Makefile	2001/02/22 05:36:20
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/rp
 
 KMOD=	rp
-SRCS=	rp.c rp_pci.c device_if.h bus_if.h pci_if.h
+SRCS=	rp.c rp_pci.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/s3/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/s3/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/modules/s3/Makefile	2001/02/04 12:35:22	1.5
+++ sys/modules/s3/Makefile	2001/02/22 05:36:20
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/fb
 
 KMOD=	s3
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h \
-	s3_pci.c
+SRCS=	s3_pci.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sf/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sf/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- sys/modules/sf/Makefile	2001/01/06 14:00:14	1.13
+++ sys/modules/sf/Makefile	2001/02/22 05:36:20
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_sf
-SRCS=	if_sf.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_sf.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sis/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sis/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/sis/Makefile	2001/01/06 14:00:14	1.10
+++ sys/modules/sis/Makefile	2001/02/22 05:36:20
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_sis
-SRCS=	if_sis.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_sis.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sk/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sk/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- sys/modules/sk/Makefile	2001/01/06 14:00:14	1.12
+++ sys/modules/sk/Makefile	2001/02/22 05:36:20
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_sk
-SRCS=	if_sk.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_sk.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sn/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sn/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/sn/Makefile	2001/01/06 14:00:15	1.3
+++ sys/modules/sn/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/sn
 
 KMOD=	if_sn
-SRCS=	if_sn.c if_sn_isa.c if_sn_pccard.c device_if.h bus_if.h isa_if.h \
-	card_if.h
+SRCS=	if_sn.c if_sn_isa.c if_sn_pccard.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/snc/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/snc/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/snc/Makefile	2001/01/06 14:00:15	1.2
+++ sys/modules/snc/Makefile	2001/02/22 05:36:21
@@ -4,9 +4,5 @@
 
 KMOD=	if_snc
 SRCS=	if_snc.c if_snc_cbus.c if_snc_pccard.c dp83932.c dp83932subr.c
-SRCS+=	opt_inet.h opt_bdg.h device_if.h bus_if.h isa_if.h
-
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/Makefile.inc,v
retrieving revision 1.2
diff -u -r1.2 Makefile.inc
--- sys/modules/sound/driver/Makefile.inc	2000/12/18 01:36:40	1.2
+++ sys/modules/sound/driver/Makefile.inc	2001/02/22 05:36:21
@@ -1,5 +1,3 @@
 # $FreeBSD: src/sys/modules/sound/driver/Makefile.inc,v 1.2 2000/12/18 01:36:40 cg Exp $
 
-SRCS		+= ac97_if.h channel_if.h feeder_if.h mixer_if.h
-
 .include "../Makefile.inc"
Index: sys/modules/sound/driver/ad1816/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/ad1816/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/ad1816/Makefile	2001/01/06 14:00:15	1.2
+++ sys/modules/sound/driver/ad1816/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
 KMOD=	snd_ad1816
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	ad1816.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/cmi/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/cmi/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/modules/sound/driver/cmi/Makefile	2001/02/05 01:16:12	1.1
+++ sys/modules/sound/driver/cmi/Makefile	2001/02/22 05:36:21
@@ -2,7 +2,6 @@
 
 .PATH:		${.CURDIR}/../../../../dev/sound/pci
 KMOD		= snd_cmi
-SRCS		= device_if.h bus_if.h isa_if.h pci_if.h
 SRCS		+= cmi.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/cs4281/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/cs4281/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/modules/sound/driver/cs4281/Makefile	2001/02/04 19:23:35	1.1
+++ sys/modules/sound/driver/cs4281/Makefile	2001/02/22 05:36:21
@@ -2,7 +2,6 @@
 
 .PATH:		${.CURDIR}/../../../../dev/sound/pci
 KMOD		= snd_cs4281
-SRCS		= device_if.h bus_if.h isa_if.h pci_if.h
 SRCS		+= cs4281.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/csa/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/csa/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/csa/Makefile	2001/01/06 14:00:16	1.2
+++ sys/modules/sound/driver/csa/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_csa
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	csa.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/csapcm/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/csapcm/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/csapcm/Makefile	2001/01/06 14:00:16	1.2
+++ sys/modules/sound/driver/csapcm/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_csapcm
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	csapcm.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/driver/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/driver/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/driver/Makefile	2001/01/06 14:00:16	1.2
+++ sys/modules/sound/driver/driver/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound
 
 KMOD=	snd_driver
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	driver.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/ds1/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/ds1/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/ds1/Makefile	2001/01/06 14:00:17	1.2
+++ sys/modules/sound/driver/ds1/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_ds1
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	ds1.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/emu10k1/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/emu10k1/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/emu10k1/Makefile	2001/01/06 14:00:17	1.2
+++ sys/modules/sound/driver/emu10k1/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_emu10k1
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	emu10k1.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/es137x/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/es137x/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/es137x/Makefile	2001/01/06 14:00:17	1.2
+++ sys/modules/sound/driver/es137x/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_es137x
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	es137x.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/es1888/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/es1888/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/es1888/Makefile	2001/01/06 14:00:18	1.2
+++ sys/modules/sound/driver/es1888/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
 KMOD=	snd_es1888
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	es1888.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/ess/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/ess/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/ess/Makefile	2001/01/06 14:00:18	1.2
+++ sys/modules/sound/driver/ess/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
 KMOD=	snd_ess
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	ess.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/fm801/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/fm801/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/fm801/Makefile	2001/01/06 14:00:18	1.2
+++ sys/modules/sound/driver/fm801/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_fm801
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	fm801.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/gusc/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/gusc/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/gusc/Makefile	2001/01/06 14:00:19	1.2
+++ sys/modules/sound/driver/gusc/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
 KMOD=	snd_gusc
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	gusc.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/maestro/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/maestro/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/maestro/Makefile	2001/01/06 14:00:19	1.2
+++ sys/modules/sound/driver/maestro/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_maestro
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	maestro.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/maestro3/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/maestro3/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/modules/sound/driver/maestro3/Makefile	2001/02/01 20:29:16	1.1
+++ sys/modules/sound/driver/maestro3/Makefile	2001/02/22 05:36:21
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/sound/driver/maestro3/Makefile,v 1.1 2001/02/01 20:29:16 scottl Exp $
 .PATH:		${.CURDIR}/../../../../dev/sound/pci
 KMOD		= snd_maestro3
-SRCS		= device_if.h bus_if.h isa_if.h pci_if.h
 SRCS		+= maestro3.c
 CFLAGS		+= -Wall
 
Index: sys/modules/sound/driver/mss/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/mss/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/sound/driver/mss/Makefile	2001/01/06 14:00:19	1.3
+++ sys/modules/sound/driver/mss/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
 KMOD=	snd_mss
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	mss.c
 
 .if ${MACHINE} == "pc98"
Index: sys/modules/sound/driver/neomagic/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/neomagic/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/neomagic/Makefile	2001/01/06 14:00:19	1.2
+++ sys/modules/sound/driver/neomagic/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_neomagic
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	neomagic.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/sb16/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/sb16/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/sb16/Makefile	2001/01/06 14:00:20	1.2
+++ sys/modules/sound/driver/sb16/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
 KMOD=	snd_sb16
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	sb16.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/sb8/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/sb8/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/sb8/Makefile	2001/01/06 14:00:20	1.2
+++ sys/modules/sound/driver/sb8/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
 KMOD=	snd_sb8
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	sb8.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/sbc/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/sbc/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/sound/driver/sbc/Makefile	2001/01/06 14:00:20	1.3
+++ sys/modules/sound/driver/sbc/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
 KMOD=	snd_sbc
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	sbc.c
 
 .if ${MACHINE} == "pc98"
Index: sys/modules/sound/driver/solo/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/solo/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/solo/Makefile	2001/01/06 14:00:21	1.2
+++ sys/modules/sound/driver/solo/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_solo
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	solo.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/t4dwave/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/t4dwave/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/t4dwave/Makefile	2001/01/06 14:00:21	1.2
+++ sys/modules/sound/driver/t4dwave/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_t4dwave
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	t4dwave.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/driver/via82c686/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/driver/via82c686/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sound/driver/via82c686/Makefile	2001/01/06 14:00:21	1.2
+++ sys/modules/sound/driver/via82c686/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_via82c686
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	via82c686.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sound/pcm/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sound/pcm/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- sys/modules/sound/pcm/Makefile	2001/01/06 14:00:22	1.8
+++ sys/modules/sound/pcm/Makefile	2001/02/22 05:36:21
@@ -3,8 +3,6 @@
 .PATH: ${.CURDIR}/../../../dev/sound/pcm
 
 KMOD=	snd_pcm
-SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
-SRCS+=	ac97_if.h channel_if.h feeder_if.h mixer_if.h
 SRCS+=	ac97_if.c channel_if.c feeder_if.c mixer_if.c
 SRCS+=	ac97.c buffer.c channel.c dsp.c fake.c
 SRCS+=	feeder.c feeder_fmt.c
Index: sys/modules/sppp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sppp/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sppp/Makefile	2001/01/06 14:00:22	1.2
+++ sys/modules/sppp/Makefile	2001/02/22 05:36:21
@@ -4,16 +4,6 @@
 
 KMOD=	sppp
 SRCS=	if_spppsubr.c
-SRCS+=	opt_inet.h opt_inet6.h opt_ipx.h
 NOMAN=
-
-opt_inet.h:
-	echo "#define INET 1" > opt_inet.h
-
-opt_inet6.h:
-	echo "#define INET6 1" > opt_inet6.h
-
-opt_ipx.h:
-	echo "#define IPX 1" > opt_ipx.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/sr/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sr/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/sr/Makefile	2001/02/04 08:23:13	1.2
+++ sys/modules/sr/Makefile	2001/02/22 05:36:21
@@ -3,6 +3,5 @@
 .PATH:  ${.CURDIR}/../../dev/sr
 KMOD    = if_sr
 SRCS    = if_sr.c if_sr_isa.c if_sr_pci.c
-SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
   
 .include <bsd.kmod.mk>
Index: sys/modules/ste/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ste/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- sys/modules/ste/Makefile	2001/01/06 14:00:23	1.11
+++ sys/modules/ste/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_ste
-SRCS=	if_ste.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_ste.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/streams/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/streams/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- sys/modules/streams/Makefile	2001/01/06 14:00:23	1.8
+++ sys/modules/streams/Makefile	2001/02/22 05:36:21
@@ -4,7 +4,7 @@
 .PATH: ${.CURDIR}/../../dev/streams
 
 KMOD=	streams
-SRCS=	streams.c opt_streams.h
+SRCS=	streams.c
 NOMAN=
 
 .if defined(DEBUG)
Index: sys/modules/svr4/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/svr4/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- sys/modules/svr4/Makefile	2001/02/04 10:52:25	1.24
+++ sys/modules/svr4/Makefile	2001/02/22 05:36:21
@@ -6,8 +6,8 @@
 
 .PATH:	${.CURDIR}/../../${TARGET_ARCH}/svr4 ${.CURDIR}/../../compat/svr4
 KMOD=	svr4
-SRCS=	svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h opt_vmpage.h \
-	vnode_if.h imgact_svr4.c svr4_signal.c svr4_fcntl.c svr4_misc.c \
+SRCS=	svr4_sysent.c svr4_sysvec.c \
+	imgact_svr4.c svr4_signal.c svr4_fcntl.c svr4_misc.c \
 	svr4_ioctl.c svr4_stat.c svr4_filio.c svr4_ttold.c svr4_termios.c \
 	svr4_stream.c svr4_socket.c svr4_sockio.c svr4_machdep.c \
 	svr4_resource.c svr4_ipc.c
@@ -27,13 +27,5 @@
 
 svr4_genassym.o: svr4_genassym.c svr4.h @ machine
 	${CC} -c ${CFLAGS} ${.IMPSRC}
-
-opt_compat.h:
-	echo "#define COMPAT_43 1" > opt_compat.h
-
-.if defined(DEBUG)
-opt_svr4.h:
-	echo "#define DEBUG_SVR4 1" > opt_svr4.h
-.endif
 
 .include <bsd.kmod.mk>
Index: sys/modules/sym/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sym/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/sym/Makefile	2001/01/06 14:00:24	1.3
+++ sys/modules/sym/Makefile	2001/02/22 05:36:21
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/sym
 
 KMOD=	sym
-SRCS=	sym_hipd.c opt_sym.h opt_cam.h opt_scsi.h
-SRCS+=	device_if.h bus_if.h pci_if.h
+SRCS=	sym_hipd.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sysvipc/sysvmsg/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sysvipc/sysvmsg/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/sysvipc/sysvmsg/Makefile	2001/02/04 08:23:13	1.3
+++ sys/modules/sysvipc/sysvmsg/Makefile	2001/02/22 05:36:22
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../../kern
 
 KMOD=	sysvmsg
-SRCS=	sysv_msg.c opt_sysvipc.h
+SRCS=	sysv_msg.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sysvipc/sysvsem/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sysvipc/sysvsem/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/sysvipc/sysvsem/Makefile	2001/02/04 08:23:13	1.3
+++ sys/modules/sysvipc/sysvsem/Makefile	2001/02/22 05:36:22
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../../kern
 
 KMOD=	sysvsem
-SRCS=	sysv_sem.c opt_sysvipc.h
+SRCS=	sysv_sem.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/sysvipc/sysvshm/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/sysvipc/sysvshm/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/modules/sysvipc/sysvshm/Makefile	2001/02/04 08:23:14	1.3
+++ sys/modules/sysvipc/sysvshm/Makefile	2001/02/22 05:36:22
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../kern
 
 KMOD=	sysvshm
-OPTS=	opt_sysvipc.h opt_compat.h opt_rlimit.h
-SRCS=	sysv_shm.c $(OPTS)
+SRCS=	sysv_shm.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/ti/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ti/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- sys/modules/ti/Makefile	2001/01/06 14:00:31	1.11
+++ sys/modules/ti/Makefile	2001/02/22 05:36:22
@@ -3,10 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_ti
-SRCS=	if_ti.c opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
-CLEANFILES=	vlan.h
-
-vlan.h:
-	touch vlan.h
+SRCS=	if_ti.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/tl/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/tl/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- sys/modules/tl/Makefile	2001/01/06 14:00:31	1.15
+++ sys/modules/tl/Makefile	2001/02/22 05:36:22
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_tl
-SRCS=	if_tl.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_tl.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/twe/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/twe/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/modules/twe/Makefile	2001/01/06 14:00:31	1.6
+++ sys/modules/twe/Makefile	2001/02/22 05:36:22
@@ -26,7 +26,7 @@
 .PATH: ${.CURDIR}/../../dev/twe
 
 KMOD=	twe
-SRCS=	bus_if.h device_if.h pci_if.h twe.c twe_freebsd.c
+SRCS=	twe.c twe_freebsd.c
 
 #CFLAGS+=-DTWE_DEBUG=0
 
Index: sys/modules/tx/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/tx/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/modules/tx/Makefile	2001/01/06 14:00:32	1.5
+++ sys/modules/tx/Makefile	2001/02/22 05:36:22
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_tx
-SRCS=	if_tx.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_tx.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/udbp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/udbp/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/modules/udbp/Makefile	2001/01/06 14:00:32	1.5
+++ sys/modules/udbp/Makefile	2001/02/22 05:36:22
@@ -5,9 +5,7 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	udbp
-SRCS=	bus_if.h device_if.h \
-	opt_usb.h \
-	udbp.c
+SRCS=	udbp.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/ugen/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ugen/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/ugen/Makefile	2001/01/06 14:00:32	1.10
+++ sys/modules/ugen/Makefile	2001/02/22 05:36:22
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	ugen
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c
+SRCS=	ugen.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/uhid/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/uhid/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/uhid/Makefile	2001/01/06 14:00:33	1.10
+++ sys/modules/uhid/Makefile	2001/02/22 05:36:22
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	uhid
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c
+SRCS=	uhid.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/ukbd/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ukbd/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- sys/modules/ukbd/Makefile	2001/01/06 14:00:33	1.13
+++ sys/modules/ukbd/Makefile	2001/02/22 05:36:22
@@ -4,12 +4,7 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	ukbd
-SRCS=	bus_if.h device_if.h vnode_if.h \
-	opt_usb.h opt_kbd.h opt_ukbd.h \
-	ukbd.c
+SRCS=	ukbd.c
 NOMAN=
-
-opt_kbd.h:
-	echo '#define KBD_INSTALL_CDEV 1' > opt_kbd.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/ulpt/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ulpt/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/ulpt/Makefile	2001/01/06 14:00:33	1.10
+++ sys/modules/ulpt/Makefile	2001/02/22 05:36:22
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	ulpt
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c
+SRCS=	ulpt.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/umapfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/umapfs/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- sys/modules/umapfs/Makefile	2001/01/06 14:00:36	1.11
+++ sys/modules/umapfs/Makefile	2001/02/22 05:36:22
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../miscfs/umapfs
 
 KMOD=	umap
-SRCS=	vnode_if.h \
-	umap_subr.c umap_vfsops.c umap_vnops.c
+SRCS=	umap_subr.c umap_vfsops.c umap_vnops.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/umass/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/umass/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- sys/modules/umass/Makefile	2001/01/06 14:00:37	1.11
+++ sys/modules/umass/Makefile	2001/02/22 05:36:22
@@ -5,9 +5,7 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	umass
-SRCS=	bus_if.h device_if.h \
-	opt_usb.h opt_cam.h opt_scsi.h \
-	umass.c
+SRCS=	umass.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/umodem/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/umodem/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/umodem/Makefile	2001/01/06 14:00:37	1.10
+++ sys/modules/umodem/Makefile	2001/02/22 05:36:22
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	umodem
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c
+SRCS=	umodem.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/ums/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/ums/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/ums/Makefile	2001/01/06 14:00:37	1.10
+++ sys/modules/ums/Makefile	2001/02/22 05:36:22
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	ums
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ums.c
+SRCS=	ums.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/union/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/union/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/union/Makefile	2001/01/06 14:00:38	1.10
+++ sys/modules/union/Makefile	2001/02/22 05:36:22
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../miscfs/union
 
 KMOD=	union
-SRCS=	vnode_if.h \
-	union_subr.c union_vfsops.c union_vnops.c
+SRCS=	union_subr.c union_vfsops.c union_vnops.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/urio/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/urio/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sys/modules/urio/Makefile	2001/01/06 14:00:38	1.4
+++ sys/modules/urio/Makefile	2001/02/22 05:36:22
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	urio
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h urio.c
+SRCS=	urio.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/usb/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/usb/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sys/modules/usb/Makefile	2001/01/06 14:00:38	1.10
+++ sys/modules/usb/Makefile	2001/02/22 05:36:22
@@ -7,9 +7,7 @@
 .PATH: $S/dev/usb $S/pci
 
 KMOD=	usb
-SRCS=	bus_if.h device_if.h usb_if.h usb_if.c \
-	vnode_if.h \
-	opt_usb.h \
+SRCS=	usb_if.c \
 	hid.c hid.h usbhid.h \
 	uhub.c \
 	usb.c usb.h \
@@ -24,7 +22,6 @@
 	
 SRCS+=	uhci_pci.c uhci.c uhcireg.h uhcivar.h
 SRCS+=	ohci_pci.c ohci.c ohcireg.h ohcivar.h
-SRCS+=	opt_bus.h pci_if.h
 
 NOMAN=
 
Index: sys/modules/uscanner/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/uscanner/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/uscanner/Makefile	2001/01/06 14:00:39	1.2
+++ sys/modules/uscanner/Makefile	2001/02/22 05:36:22
@@ -4,8 +4,8 @@
 
 .PATH: ${.CURDIR}/../../dev/usb
 
-KMOD=	 uscanner
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h uscanner.c
+KMOD=	uscanner
+SRCS=	uscanner.c
 NOMAN=
 
 CFLAGS+= -g
Index: sys/modules/vesa/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/vesa/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- sys/modules/vesa/Makefile	2001/01/06 14:00:39	1.13
+++ sys/modules/vesa/Makefile	2001/02/22 05:36:22
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
 
 KMOD=	vesa
-SRCS=	vesa.c scvesactl.c opt_vga.h opt_vesa.h
+SRCS=	vesa.c scvesactl.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/vinum/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/vinum/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- sys/modules/vinum/Makefile	2001/01/06 14:00:39	1.21
+++ sys/modules/vinum/Makefile	2001/02/22 05:36:22
@@ -3,11 +3,11 @@
 .PATH: ${.CURDIR}/../../dev/vinum
 
 KMOD=	vinum
-SRCS=	opt_vinum.h request.h vinum.c vinumconfig.c vinumdaemon.c \
+SRCS=	request.h vinum.c vinumconfig.c vinumdaemon.c \
 	vinumext.h vinumhdr.h vinuminterrupt.c vinumio.c vinumio.h \
 	vinumioctl.c vinumkw.h vinumlock.c vinummemory.c vinumparser.c \
 	vinumraid5.c vinumrequest.c vinumrevive.c vinumstate.c \
-	vinumstate.h vinumutil.c vinumvar.h vnode_if.h
+	vinumstate.h vinumutil.c vinumvar.h
 NOMAN=
 
 # If you remove -DVINUMDEBUG here, you must also do it in src/sbin/Makefile.
Index: sys/modules/vn/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/vn/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sys/modules/vn/Makefile	2001/01/06 14:00:40	1.9
+++ sys/modules/vn/Makefile	2001/02/22 05:36:22
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/vn
 
 KMOD=	vn
-SRCS=	vn.c vnode_if.h
+SRCS=	vn.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/vpo/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/vpo/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/modules/vpo/Makefile	2001/01/06 14:00:40	1.5
+++ sys/modules/vpo/Makefile	2001/02/22 05:36:22
@@ -3,9 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/ppbus
 
 KMOD=	vpo
-SRCS=	bus_if.h device_if.h ppbus_if.h \
-	opt_cam.h opt_scsi.h opt_vpo.h \
-	immio.c vpo.c vpoio.c
+SRCS=	immio.c vpo.c vpoio.c
 NOMAN=
 
 .include <bsd.kmod.mk>
Index: sys/modules/vr/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/vr/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- sys/modules/vr/Makefile	2001/01/06 14:00:40	1.12
+++ sys/modules/vr/Makefile	2001/02/22 05:36:22
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_vr
-SRCS=	if_vr.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_vr.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/vx/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/vx/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/vx/Makefile	2001/01/06 14:00:41	1.2
+++ sys/modules/vx/Makefile	2001/02/22 05:36:22
@@ -7,6 +7,5 @@
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=	if_vx_eisa.c
 .endif
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/wb/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/wb/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- sys/modules/wb/Makefile	2001/01/06 14:00:41	1.12
+++ sys/modules/wb/Makefile	2001/02/22 05:36:22
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_wb
-SRCS=	if_wb.c opt_bdg.h device_if.h
-SRCS+=	bus_if.h miibus_if.h pci_if.h
+SRCS=	if_wb.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/wi/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/wi/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sys/modules/wi/Makefile	2001/01/17 22:37:52	1.9
+++ sys/modules/wi/Makefile	2001/02/22 05:36:22
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/wi
 
 KMOD=	if_wi
-SRCS=	if_wi.c card_if.h device_if.h bus_if.h
+SRCS=	if_wi.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/wx/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/wx/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sys/modules/wx/Makefile	2001/01/06 14:00:41	1.2
+++ sys/modules/wx/Makefile	2001/02/22 05:36:22
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_wx
-SRCS=	if_wx.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_wx.c
 
 .include <bsd.kmod.mk>
Index: sys/modules/xl/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/xl/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- sys/modules/xl/Makefile	2001/01/06 14:00:42	1.13
+++ sys/modules/xl/Makefile	2001/02/22 05:36:22
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_xl
-SRCS=	if_xl.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS+=	miibus_if.h
+SRCS=	if_xl.c
 
 .include <bsd.kmod.mk>