svn commit: r187847 - user/thompsa/usb/sys/i386/conf

[Andrew Thompson]

Author: thompsa
Date: Wed Jan 28 19:32:19 2009
New Revision: 187847
URL: http://svn.freebsd.org/changeset/base/187847

Log:
  For some reason subversion hasnt properly merged OpenBSM alpha 5 in r187214
  from head, just disable audit locally.

Modified:
  user/thompsa/usb/sys/i386/conf/GENERIC

Modified: user/thompsa/usb/sys/i386/conf/GENERIC
==============================================================================
--- user/thompsa/usb/sys/i386/conf/GENERIC	Wed Jan 28 19:25:51 2009	(r187846)
+++ user/thompsa/usb/sys/i386/conf/GENERIC	Wed Jan 28 19:32:19 2009	(r187847)
@@ -70,7 +70,7 @@ options 	_KPOSIX_PRIORITY_SCHEDULING # P
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
 options  	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
-options 	AUDIT			# Security event auditing
+#options 	AUDIT			# Security event auditing
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 
 # Debugging for use in -current