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.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- src/sys/arch/amd64/conf/GENERIC	2008/05/01 20:18:18	1.208
+++ src/sys/arch/amd64/conf/GENERIC	2008/05/02 15:26:38	1.209
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.208 2008/05/01 20:18:18 cegger Exp $
+# $NetBSD: GENERIC,v 1.209 2008/05/02 15:26:38 ad 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.208 $"
+#ident 		"GENERIC-$Revision: 1.209 $"
 
 maxusers	64		# estimated number of users
 
@@ -66,6 +66,7 @@ options 	SYSVSHM		# System V-like memory
 options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
 
 options 	LKM		# loadable kernel modules
+options		MODULAR		# new style module framework
 options 	USERCONF	# userconf(4) support
 #options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
@@ -1008,6 +1009,9 @@ options 	RAID_AUTOCONFIG		# auto-configu
 pseudo-device	fss		4	# file system snapshot device
 
 pseudo-device	md		1	# memory disk device (ramdisk)
+options		MEMORY_DISK_HOOKS	# enable root ramdisk
+options		MEMORY_DISK_DYNAMIC	# loaded via kernel module
+
 pseudo-device	vnd			# disk-like interface to files
 #options 	VND_COMPRESSION		# compressed vnd(4)