Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x68k/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x68k/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14.2.2
retrieving revision 1.15
diff -u -p -r1.14.2.2 -r1.15
--- src/sys/arch/x68k/conf/GENERIC	1998/10/13 21:23:34	1.14.2.2
+++ src/sys/arch/x68k/conf/GENERIC	1997/11/17 01:58:40	1.15
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.14.2.2 1998/10/13 21:23:34 cgd Exp $
+#	$NetBSD: GENERIC,v 1.15 1997/11/17 01:58:40 lukem Exp $
 
 #
 #	GENERIC
@@ -26,6 +26,7 @@ options 	SWAPPAGER		# swap pager (anonym
 options 	VNODEPAGER		# vnode pager (mapped files)
 options 	DEVPAGER		# device pager (mapped devices)
 #options 	DDB			# kernel debugger; recommended
+#options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
 #options 	DIAGNOSTIC		# internal consistency checking
 
 options 	KTRACE			# system call tracing, a la ktrace(1)
@@ -81,6 +82,7 @@ options 	INET			# Internet protocols
 
 # Options specific to this host.
 options 	DEBUG
+options 	MACHINE_NONCONTIG	# support for noncontig memory
 options 	FPSP			# '40 Floating Point Software
 options 	ITEKANJI		# Kanji display for console
 options 	PANICBUTTON		# enable interrupt switch
@@ -92,13 +94,6 @@ options 	MAPPEDCOPY		# use page mapping 
 #options 	KGDB,"KGDBDEV=15*256+2", KGDBRATE=19200
 #options 	PPP_OUTQ_SIZE=4096
 
-# high memory support
-# CAUTION: DO NOT UNCOMMENT BELOW UNLESS YOU HAVE THAT MEMORY
-#options 	EXTMEM_LOW=0x01000000,EXTMEM_SIZE=16*1024*1024
-					# TS-6BE16 support
-#options 	EXTMEM_LOW=0x10000000,EXTMEM_SIZE=4*1024*1024
-					# 060turbo onboard memory support
-
 #config		netbsd root on sd6a 
 config		netbsd root on ? type ?
 
@@ -152,5 +147,3 @@ pseudo-device	pow		2	# software power sw
 pseudo-device	loop			# loopback; recommended
 #pseudo-device	vnd		10	# vn virtual filesystem device
 #pseudo-device	ccd		4	# concatenating disk driver
-# rnd is EXPERIMENTAL
-#pseudo-device	rnd			# /dev/random and in-kernel generator