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.317.2.1
retrieving revision 1.317.2.2
diff -u -p -r1.317.2.1 -r1.317.2.2
--- src/sys/arch/alpha/conf/GENERIC	2007/11/06 23:13:49	1.317.2.1
+++ src/sys/arch/alpha/conf/GENERIC	2008/01/09 01:44:35	1.317.2.2
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.317.2.1 2007/11/06 23:13:49 matt Exp $
+# $NetBSD: GENERIC,v 1.317.2.2 2008/01/09 01:44:35 matt 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.317.2.1 $"
+ident		"GENERIC-$Revision: 1.317.2.2 $"
 
 maxusers 32
 
@@ -46,7 +46,6 @@ options 	API_UP1000	# EV6:		Alpha Proces
 
 # Standard system options
 options 	KTRACE			# System call tracing support
-#options 	SYSTRACE		# System call vetting via systrace(1)
 options 	NTP			# kernel PLL for NTP
 
 # Enable experimental buffer queue strategy for better responsiveness under
@@ -634,6 +633,7 @@ btbc* at pcmcia? function ?		# AnyCom Bl
 ubt* at uhub? port ?
 
 # Bluetooth Device Hub
+bthub* at bcsp?
 bthub* at bt3c?
 bthub* at btbc?
 bthub* at btuart?
@@ -726,6 +726,7 @@ pseudo-device	ksyms			# /dev/ksyms
 #pseudo-device	pf			# PF packet filter
 #pseudo-device	pflog			# PF log if
 pseudo-device	lockstat		# lock profiling
+pseudo-device	bcsp			# BlueCore Serial Protocol
 pseudo-device	btuart			# Bluetooth HCI UART (H4)
 
 #options	FILEASSOC		# fileassoc(9) - required for Veriexec
@@ -746,4 +747,6 @@ pseudo-device	btuart			# Bluetooth HCI U
 #options 	VERIFIED_EXEC_FP_SHA1
 #options 	VERIFIED_EXEC_FP_MD5
 
-options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
+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