PERFORCE change 173971 for review

[Robert Watson]

http://p4web.freebsd.org/chv.cgi?CH=173971

Change 173971 by rwatson at rwatson_vimage_client on 2010/01/30 21:34:01

	For sample CAPABILITIES configuration files, set the kernel ident, and
	synchronize between amd64/i386 options.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/CAPABILITIES#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/CAPABILITIES#3 (text+ko) ====

@@ -1,4 +1,5 @@
 include GENERIC
+ident CAPABILITIES
 
 options CAPABILITIES
 options PROCDESC
@@ -6,4 +7,3 @@
 options WITNESS
 options KDB
 options DDB
-

==== //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#4 (text+ko) ====

@@ -1,4 +1,9 @@
 include GENERIC
+ident CAPABILITIES
+
 options CAPABILITIES
 options PROCDESC
 options KDTRACE_HOOKS
+options WITNESS
+options KDB
+options DDB