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.331.2.3
retrieving revision 1.332
diff -u -p -r1.331.2.3 -r1.332
--- src/sys/arch/alpha/conf/GENERIC	2011/04/21 01:40:46	1.331.2.3
+++ src/sys/arch/alpha/conf/GENERIC	2010/04/07 17:51:16	1.332
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.331.2.3 2011/04/21 01:40:46 rmind Exp $
+# $NetBSD: GENERIC,v 1.332 2010/04/07 17:51:16 jakllsch 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.331.2.3 $"
+ident		"GENERIC-$Revision: 1.332 $"
 
 maxusers 32
 
@@ -87,12 +87,11 @@ 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		# legacy UFS quotas
-options 	QUOTA2		# new, in-filesystem UFS quotas
+options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independant support
 options 	WAPBL		# File system journaling support - Experimental
 #options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
@@ -118,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
 
@@ -663,10 +661,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?
 
@@ -713,10 +707,10 @@ 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		
+pseudo-device	md		1
 pseudo-device	ppp		
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
 pseudo-device	pty			# pseudo-terminals
@@ -773,3 +767,5 @@ pseudo-device	putter			# for puffs and p
 options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
 #options PAX_SEGVGUARD=0			# PaX Segmentation fault guard
 options PAX_ASLR=0			# PaX Address Space Layout Randomization
+
+ath* at pci? dev ? function?