From owner-svn-src-all@FreeBSD.ORG  Thu Dec 11 16:13:17 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 915681065673;
	Thu, 11 Dec 2008 16:13:17 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8188E8FC08;
	Thu, 11 Dec 2008 16:13:17 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBGDHdA069604;
	Thu, 11 Dec 2008 16:13:17 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBBGDHRM069603;
	Thu, 11 Dec 2008 16:13:17 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200812111613.mBBGDHRM069603@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Thu, 11 Dec 2008 16:13:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185936 - head/sys/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Dec 2008 16:13:17 -0000

Author: bz
Date: Thu Dec 11 16:13:17 2008
New Revision: 185936
URL: http://svn.freebsd.org/changeset/base/185936

Log:
  Put the VIMAGE options together in one place.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/conf/options

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Thu Dec 11 16:09:31 2008	(r185935)
+++ head/sys/conf/options	Thu Dec 11 16:13:17 2008	(r185936)
@@ -415,7 +415,6 @@ TCPDEBUG
 TCP_OFFLOAD_DISABLE	opt_inet.h #Disable code to dispatch tcp offloading
 TCP_SIGNATURE		opt_inet.h
 VLAN_ARRAY		opt_vlan.h
-VIMAGE_GLOBALS		opt_global.h
 XBONEHACK
 
 #
@@ -786,3 +785,4 @@ IEEE80211_AMPDU_AGE	opt_wlan.h
 
 # Virtualize the network stack
 VIMAGE			opt_global.h
+VIMAGE_GLOBALS		opt_global.h