*** empty log message ***

sys/arch/i386/conf/TRINITY

@@ -1,29 +1,55 @@
 #
 # TRINITY -- Mycroft's 386 box
 #
-#	$Id: TRINITY,v 1.19 1993/08/30 07:08:04 deraadt Exp $
+#	$Id: TRINITY,v 1.20 1993/10/01 04:00:45 mycroft Exp $
 #
 
 machine		"i386"
 cpu		"I386_CPU"
+options		"DUMMY_NOPS"
+options		"MACHINE_NONCONTIG"
+options		XSERVER,UCONSOLE
+
 ident		TRINITY
-timezone	5 dst
 maxusers	16
-options		SWAPPAGER,VNODEPAGER,DEVPAGER
-options		INET,NFSCLIENT,NFSSERVER
+timezone	5 dst
+
+options		SWAPPAGER
+options		VNODEPAGER,DEVPAGER
+options		DDB
+#options	DIAGNOSTIC
+options		ACCOUNTING
+options		KTRACE
+options		FIFO
+#options	SYSVSHM
+#options	"SHMMAXPGS=1024"
+options		LKM
+
+options		"COMPAT_NOMID"
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
-options		"COMPAT_NOMID"
-options		XSERVER,UCONSOLE
+
+options		QUOTA
+options		FFS
+options		MFS
+options		NFSSERVER
+options		NFSCLIENT
 options		ISOFS
 options		MSDOSFS
+options		FDESC
 options		KERNFS
-options		SCSI
-options		DDB
-options		"DUMMY_NOPS"
-options		"SYMTAB_SPACE=65000"
 
-config		netbsd	root on sd0 swap on sd0 and sd1 and sd2 and sd3
+options		GATEWAY
+options		INET
+options		NS
+options		CCITT
+options		ISO
+options		TPIP
+options		EON
+
+options		SCSI
+
+config		netbsd	at 0xfe100000 root on sd0 swap on sd0 and sd1 and sd2 and sd3
 
 controller	isa0
 controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
@@ -42,14 +68,13 @@ disk		fd1	at fdc0 drive 1
 
 device		pc0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
+
 device		com0	at isa? port "IO_COM1" tty irq 4 vector comintr
 device		com1	at isa? port "IO_COM2" tty irq 3 vector comintr
 
 device		lms0	at isa? port "IO_BMS1" tty irq 5 vector lmsintr
 
-device		ne0	at isa? port 0x300 net irq 9 vector neintr
-
-#device we0 at isa? port 0x280 net irq 9 iomem 0xd0000 iosiz 8192 vector weintr
+device		ed0	at isa? port 0x300 net irq 9 vector edintr
 
 pseudo-device	loop
 pseudo-device	ether