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/alpha/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/alpha/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.322.10.4
retrieving revision 1.323
diff -u -p -r1.322.10.4 -r1.323
--- src/sys/arch/alpha/conf/GENERIC	2010/08/11 22:51:31	1.322.10.4
+++ src/sys/arch/alpha/conf/GENERIC	2008/05/30 20:10:01	1.323
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.322.10.4 2010/08/11 22:51:31 yamt Exp $
+# $NetBSD: GENERIC,v 1.323 2008/05/30 20:10:01 tsutsui Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.322.10.4 $"
+ident		"GENERIC-$Revision: 1.323 $"
 
 maxusers 32
 
@@ -80,20 +80,20 @@ file-system	NFS		# Sun NFS-compatible fi
 file-system	NULLFS		# Null file system layer
 file-system	KERNFS		# Kernel variable file system (/kern)
 file-system	FDESC		# File descriptor file system (/dev/fd)
-file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
+file-system	PORTAL		# Portal file system
 file-system	UMAPFS		# User-mapping file system layer
 file-system	PROCFS		# Process file system (/proc)
 file-system	UNION		# union file system
 file-system	CODA		# CODA distributed file system
 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 Independant support
-options 	WAPBL		# File system journaling support - Experimental
+options 	SOFTDEP		# FFS soft updates support.
 #options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
 options 	NFSSERVER	# Sun NFS-compatible file system server
 #options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
@@ -117,7 +117,6 @@ options 	PPP_FILTER	# Active filter supp
 options 	PFIL_HOOKS	# pfil(9) packet filter hooks
 options 	IPFILTER_LOG	# ipmon(8) log support
 options 	IPFILTER_LOOKUP	# ippool(8) support
-options 	IPFILTER_COMPAT # Compat for IP-Filter
 #options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
 #options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
 
@@ -149,7 +148,6 @@ options 	COMPAT_16
 options 	COMPAT_20
 options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_40	# NetBSD 4.0 compatibility.
-options 	COMPAT_50	# NetBSD 5.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 # OSF/1 binary compatibility
 options 	COMPAT_OSF1
@@ -171,6 +169,7 @@ options 	SYSVSHM
 options 	P1003_1B_SEMAPHORE
 
 # Loadable Kernel Modules
+options 	LKM
 
 # Disable kernel security.
 #options 	INSECURE
@@ -387,13 +386,6 @@ mpu*	at	cmpci?
 mpu*	at	eso?
 mpu*	at	yds?
 
-# I2O devices
-iop*	at pci? dev ? function ?	# I/O processor
-iopsp*	at iop? tid ?			# SCSI/FC-AL ports
-ld*	at iop? tid ?			# block devices
-# XXX dpti.c wants a processor type that is not assigned for x86-64
-#dpti*	at iop? tid 0			# DPT/Adaptec control interface
-
 # MII/PHY support
 exphy*	at mii? phy ?			# 3Com internal PHYs
 icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
@@ -576,9 +568,6 @@ ulpt*	at uhub? port ? configuration ? in
 umodem*	at uhub? port ? configuration ?
 ucom*	at umodem?
 
-# Option N.V. Wireless WAN modems
-uhso*	at uhub? port ? configuration ?
-
 # USB Mass Storage
 umass*	at uhub? port ? configuration ? interface ?
 
@@ -662,10 +651,6 @@ wsmouse* at btms? mux 0
 btkbd* at bthidev? reportid ?
 wskbd* at btkbd? console ? mux 1
 
-# Bluetooth Apple Magic Mouse
-btmagic* at bthub?
-wsmouse* at btmagic? mux 0
-
 # Bluetooth Audio support
 btsco* at bthub?
 
@@ -690,11 +675,6 @@ wsmouse*	at	vsms?
 wskbd*		at	pckbd?
 wsmouse*	at	pms?
 
-#
-# accept filters
-pseudo-device   accf_data		# "dataready" accept filter
-pseudo-device   accf_http		# "httpready" accept filter
-
 pseudo-device 	crypto			# /dev/crypto device
 pseudo-device	swcrypto		# software crypto implementation
 
@@ -712,7 +692,7 @@ options 	RAID_AUTOCONFIG		# auto-configu
 #options 	RF_INCLUDE_INTERDECLUSTER=1
 #options 	RF_INCLUDE_PARITY_DECLUSTERING=1
 #options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
-pseudo-device	fss			# file system snapshot device
+pseudo-device	fss		4	# file system snapshot device
 pseudo-device	ipfilter	1
 pseudo-device	loop		1
 pseudo-device	md		1
@@ -749,7 +729,6 @@ pseudo-device	ksyms			# /dev/ksyms
 pseudo-device	lockstat		# lock profiling
 pseudo-device	bcsp			# BlueCore Serial Protocol
 pseudo-device	btuart			# Bluetooth HCI UART (H4)
-pseudo-device	putter			# for puffs and pud
 
 #options	FILEASSOC		# fileassoc(9) - required for Veriexec