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.915
retrieving revision 1.915.2.1
diff -u -p -r1.915 -r1.915.2.1
--- src/sys/arch/i386/conf/GENERIC	2008/10/29 11:56:53	1.915
+++ src/sys/arch/i386/conf/GENERIC	2008/11/18 01:56:58	1.915.2.1
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.915 2008/10/29 11:56:53 joerg Exp $
+# $NetBSD: GENERIC,v 1.915.2.1 2008/11/18 01:56:58 snj Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.915 $"
+#ident 		"GENERIC-$Revision: 1.915.2.1 $"
 
 maxusers	64		# estimated number of users
 
@@ -142,6 +142,7 @@ options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
 options 	COMPAT_30	# NetBSD 3.0
+options 	COMPAT_30_PTHREAD # NetBSD 3.0 pthreads compatibility.
 options 	COMPAT_40	# NetBSD 4.0
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID