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/amd64/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/amd64/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- src/sys/arch/amd64/conf/GENERIC	2004/07/15 03:53:45	1.28
+++ src/sys/arch/amd64/conf/GENERIC	2004/09/04 23:29:45	1.29
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.28 2004/07/15 03:53:45 atatat Exp $
+# $NetBSD: GENERIC,v 1.29 2004/09/04 23:29:45 manu Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.28 $"
+#ident 		"GENERIC-$Revision: 1.29 $"
 
 maxusers	32		# estimated number of users
 
@@ -134,6 +134,7 @@ options 	INET6		# IPV6
 #options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
 #options 	IPSEC_DEBUG	# debug for IP security
 #options 	MROUTING	# IP multicast routing
+#options 	PIM		# Protocol Independent Multicast
 options 	NS		# XNS
 #options 	NSIP		# XNS tunneling over IP
 options 	ISO,TPIP	# OSI