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/i386/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1107.2.9
retrieving revision 1.1107.2.9.2.2
diff -u -p -r1.1107.2.9 -r1.1107.2.9.2.2
--- src/sys/arch/i386/conf/GENERIC	2016/12/09 05:10:45	1.1107.2.9
+++ src/sys/arch/i386/conf/GENERIC	2018/02/25 21:15:38	1.1107.2.9.2.2
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1107.2.9 2016/12/09 05:10:45 snj Exp $
+# $NetBSD: GENERIC,v 1.1107.2.9.2.2 2018/02/25 21:15:38 snj Exp $
 #
 # GENERIC machine description file
 #
@@ -22,12 +22,12 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.1107.2.9 $"
+#ident 		"GENERIC-$Revision: 1.1107.2.9.2.2 $"
 
 maxusers	64		# estimated number of users
 
 # CPU-related options.
-options 	VM86		# virtual 8086 emulation
+#options 	VM86		# virtual 8086 emulation
 options 	USER_LDT	# user-settable LDT; used by WINE
 #options 	PAE		# PAE mode (36 bits physical addressing)
 
@@ -144,8 +144,8 @@ options 	COMPAT_43	# 4.3BSD, 386BSD, and
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
 options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
-options 	COMPAT_SVR4	# binary compatibility with SVR4
-options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
+#options 	COMPAT_SVR4	# binary compatibility with SVR4
+#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
 #options 	COMPAT_NDIS	# NDIS network driver