Make kernel config again.

at least isa,eisa,pci ocnfigs were affected.

4 files changed, 47 insertions, 20 deletions

diff --git a/sys/conf/defines b/sys/conf/defines
index ea7046324e3..55b3774242d 100644
--- a/sys/conf/defines
+++ b/sys/conf/defines
@@ -1,15 +1,11 @@
 /:#if.*[ \t]*KPROF/d
 /:#if.*[ \t]*PGINPROF/d
-/:#if.*[ \t]*UNFAST/d
-/:#if.*[ \t]*INSECURE/d
 /:#if.*[ \t]*TRACE/d
-/:#if.*[ \t]*DISKMON/d
-/:#if.*[ \t]*INTRLVE/d
 /:#if.*[ \t]*lint/d
 /:#if.*[ \t]*notdef/d
 /:#if.*[ \t]*unneeded/d
 /:#if.*[ \t]*vax/d
 /:#if.*[ \t]*TCPTRUEOOB/d
-/:#if.*[ \t]*irele/d
-/:#if.*[ \t]*ilock/d
 /:#if.*[ \t]*notyet/d
+/:#if.*[ \t]*_KERNEL/d
+/:#if.*[ \t]*_LOCORE/d
diff --git a/sys/conf/files b/sys/conf/files
index 8ed111ccf75..4f8c7cc2fcd 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,5 @@
-#	$NetBSD: files,v 1.74 1996/02/13 17:09:46 christos Exp $
+#	$OpenBSD: files,v 1.13 1996/04/19 07:31:23 mickey Exp $
+#	$NetBSD: files,v 1.82 1996/03/19 01:02:35 paulus Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -26,6 +27,15 @@ define	pdq		# DEC FDDI chipset
 define	ncr5380sbc	# NCR 5380 SCSI Bus Controller
 define	aic7xxx		# Adaptec aic7770 and aic7870 SCSI controllers
 
+# Attributes which machine-independent bus support can be attached to.
+# These should be defined here, because some of these busses can have
+# devices which provide these attributes, and we'd like to avoid hairy
+# ordering constraints on inclusion of the busses' "files" files.
+define	isabus { }			# ISA attachment
+define	eisabus { }			# EISA attachment
+define	pcibus {[bus = -1]}		# PCI attachment
+define	tcbus { }			# TurboChannel attachment
+
 # legitimate pseudo-devices
 pseudo-device vnd: disk
 pseudo-device ccd: disk
@@ -96,8 +106,8 @@ file kern/kern_exit.c
 file kern/kern_fork.c
 file kern/kern_ktrace.c			ktrace
 file kern/kern_lkm.c			lkm
-file kern/kern_malloc.c
 file kern/kern_ntptime.c
+file kern/kern_malloc.c
 file kern/kern_physio.c
 file kern/kern_proc.c
 file kern/kern_prot.c
@@ -182,7 +192,7 @@ file msdosfs/msdosfs_lookup.c		msdosfs
 file msdosfs/msdosfs_vfsops.c		msdosfs
 file msdosfs/msdosfs_vnops.c		msdosfs
 file net/bpf.c				bpfilter		needs-count
-file net/bpf_filter.c			bpfilter
+file net/bpf_filter.c			bpfilter ppp
 file net/if.c
 file net/if_arcsubr.c			arc			needs-flag
 file net/if_ethersubr.c			ether fddi		needs-flag
@@ -191,7 +201,9 @@ file net/if_loop.c			loop			needs-count
 file net/if_sl.c			sl			needs-count
 file net/if_ppp.c			ppp			needs-count
 file net/ppp_tty.c			ppp
-file net/bsd-comp.c			ppp
+file net/bsd-comp.c			ppp_bsdcomp
+file net/ppp-deflate.c			ppp_deflate
+file net/zlib.c				ppp_deflate
 file net/if_tun.c			tun			needs-count
 file net/radix.c
 file net/raw_cb.c
@@ -285,9 +297,20 @@ file netns/ns_ip.c			ns
 file netns/ns_output.c			ns
 file netns/ns_pcb.c			ns
 file netns/ns_proto.c			ns
-file netns/ns_cksum.c			ns
 file netns/spp_debug.c			ns
 file netns/spp_usrreq.c			ns
+file netipx/ipx.c			ipx
+file netipx/ipx_cksum.c			ipx
+file netipx/ipx_error.c			ipx
+file netipx/ipx_input.c			ipx
+file netipx/ipx_ip.c			ipx
+file netipx/ipx_outputfl.c		ipx
+file netipx/ipx_pcb.c			ipx
+file netipx/ipx_proto.c			ipx
+file netipx/ipx_tun.c			ipx
+file netipx/ipx_usrreq.c		ipx
+file netipx/spx_debug.c			ipx
+file netipx/spx_usrreq.c		ipx
 file nfs/krpc_subr.c			nfsclient
 file nfs/nfs_bio.c			nfsclient
 file nfs/nfs_boot.c			nfsclient
diff --git a/sys/conf/files.oldconf b/sys/conf/files.oldconf
index d9e62c33e26..307ac1334fd 100644
--- a/sys/conf/files.oldconf
+++ b/sys/conf/files.oldconf
@@ -1,4 +1,5 @@
-#	$NetBSD: files.oldconf,v 1.62 1996/02/03 00:23:51 mycroft Exp $
+#	$OpenBSD: files.oldconf,v 1.7 1996/04/19 07:31:23 mickey Exp $
+#	$NetBSD: files.oldconf,v 1.67 1996/03/19 04:40:54 scottr Exp $
 #
 adosfs/adlookup.c	optional adosfs
 adosfs/adutil.c		optional adosfs
@@ -44,6 +45,7 @@ kern/kern_fork.c	standard
 kern/kern_ktrace.c	optional ktrace
 kern/kern_lkm.c		optional lkm
 kern/kern_malloc.c	standard
+kern/kern_ntptime.c	standard
 kern/kern_physio.c	standard
 kern/kern_proc.c	standard
 kern/kern_prot.c	standard
@@ -126,14 +128,16 @@ msdosfs/msdosfs_lookup.c	optional msdosfs
 msdosfs/msdosfs_vfsops.c	optional msdosfs
 msdosfs/msdosfs_vnops.c		optional msdosfs
 net/bpf.c		optional bpfilter
-net/bpf_filter.c	optional bpfilter device-driver
+net/bpf_filter.c	optional bpfilter or ppp device-driver
 net/if.c		standard
 net/if_arcsubr.c      optional arc device-driver
 net/if_ethersubr.c	optional ether device-driver
 net/if_loop.c		optional loop device-driver
 net/if_ppp.c		optional ppp device-driver
-net/bsd-comp.c		optional ppp
+net/bsd-comp.c		optional ppp_bsdcomp
 net/ppp_tty.c		optional ppp
+net/ppp-deflate.c	optional ppp_deflate
+net/zlib.c		optional ppp_deflate
 net/if_sl.c		optional sl device-driver
 net/if_tun.c		optional tun device-driver
 net/radix.c		standard
@@ -181,11 +185,6 @@ netinet/tcp_subr.c	optional inet
 netinet/tcp_timer.c	optional inet
 netinet/tcp_usrreq.c	optional inet
 netinet/udp_usrreq.c	optional inet
-netinet/ip_fil.c	optional ipfilter requires inet
-netinet/fil.c		optional ipfilter requires inet
-netinet/ip_nat.c	optional ipfilter requires inet
-netinet/ip_frag.c	optional ipfilter requires inet
-netinet/ip_state.c	optional ipfilter requires inet
 netiso/clnp_debug.c	optional iso
 netiso/clnp_er.c	optional iso
 netiso/clnp_frag.c	optional iso
@@ -291,3 +290,5 @@ vm/vm_unix.c		standard
 vm/vm_user.c		standard
 vm/vnode_pager.c	optional vnodepager
 dev/ccd.c		optional ccd needs-count
+# XXX !! This should not be necessary!
+dev/audio.c		optional audio device-driver
diff --git a/sys/conf/param.c b/sys/conf/param.c
index 28f04ec7370..a91c9e1d3d2 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: param.c,v 1.15 1995/03/08 00:54:44 cgd Exp $	*/
+/*	$OpenBSD: param.c,v 1.2 1996/04/19 07:31:24 mickey Exp $	*/
+/*	$NetBSD: param.c,v 1.16 1996/03/12 03:08:40 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1989 Regents of the University of California.
@@ -75,6 +76,12 @@
  * Compiled with -DHZ=xx -DTIMEZONE=x -DDST=x -DMAXUSERS=xx
  */
 
+#ifndef TIMEZONE
+# define TIMEZONE 0
+#endif
+#ifndef DST
+# define DST 0
+#endif
 #ifndef HZ
 #define	HZ 100
 #endif