From owner-svn-soc-all@FreeBSD.ORG  Sun Jun 26 19:14:23 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 8927D106564A
	for <svn-soc-all@FreeBSD.org>; Sun, 26 Jun 2011 19:14:21 +0000 (UTC)
	(envelope-from kibab@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 26 Jun 2011 19:14:21 +0000
Date: Sun, 26 Jun 2011 19:14:21 +0000
From: kibab@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110626191421.8927D106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223745 -
	soc2011/kibab/freebsd-src-head/sys/amd64/conf
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jun 2011 19:14:23 -0000

Author: kibab
Date: Sun Jun 26 19:14:21 2011
New Revision: 223745
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223745

Log:
  options CAPABILITIES is included into kernel configuration

Modified:
  soc2011/kibab/freebsd-src-head/sys/amd64/conf/CAPSICUM

Modified: soc2011/kibab/freebsd-src-head/sys/amd64/conf/CAPSICUM
==============================================================================
--- soc2011/kibab/freebsd-src-head/sys/amd64/conf/CAPSICUM	Sun Jun 26 19:13:38 2011	(r223744)
+++ soc2011/kibab/freebsd-src-head/sys/amd64/conf/CAPSICUM	Sun Jun 26 19:14:21 2011	(r223745)
@@ -63,6 +63,7 @@
 options 	MAC			# TrustedBSD MAC Framework
 options 	KDTRACE_FRAME		# Ensure frames are compiled in
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options         CAPABILITIES		# Support for Capsicum
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # Debugging for use in -current