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/landisk/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/landisk/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -p -r1.12.4.1 -r1.12.4.2
--- src/sys/arch/landisk/conf/GENERIC	2008/05/16 02:22:42	1.12.4.1
+++ src/sys/arch/landisk/conf/GENERIC	2009/05/04 08:11:23	1.12.4.2
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.12.4.1 2008/05/16 02:22:42 yamt Exp $
+# $NetBSD: GENERIC,v 1.12.4.2 2009/05/04 08:11:23 yamt Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/landisk/conf/std.landisk"
 
 options         INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.12.4.1 $"
+#ident          "GENERIC-$Revision: 1.12.4.2 $"
 
 maxusers	16		# estimated number of users
 
@@ -59,7 +59,7 @@ options 	SYSVSEM		# System V-like semaph
 options 	SYSVSHM		# System V-like memory sharing
 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)
@@ -84,6 +84,7 @@ options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
 options 	COMPAT_30	# NetBSD 3.0,
 options 	COMPAT_40	# NetBSD 4.0,
+options 	COMPAT_50	# NetBSD 5.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
@@ -113,13 +114,13 @@ file-system 	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
 file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
-#file-system	TMPFS		# Efficient memory file-system
+file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
 options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
-options 	SOFTDEP		# FFS soft updates support.
+options 	WAPBL		# File system journaling support - Experimental
 #options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
 options 	NFSSERVER	# Network File System server
 #options 	FFS_NO_SNAPSHOT	# ffs snapshots
@@ -405,6 +406,11 @@ cinclude "arch/landisk/conf/GENERIC.loca
 
 # Pseudo-Devices
 
+#
+# accept filters
+pseudo-device   accf_data		# "dataready" accept filter
+pseudo-device   accf_http		# "httpready" accept filter
+
 # disk/mass storage pseudo-devices
 pseudo-device	ccd		4	# concatenated/striped disk devices
 #pseudo-device	cgd		4	# cryptographic disk devices