From owner-svn-src-all@FreeBSD.ORG  Tue Sep 17 01:54:14 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0BE1115F;
 Tue, 17 Sep 2013 01:54:14 +0000 (UTC)
 (envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EE44D20F1;
 Tue, 17 Sep 2013 01:54:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8H1sD1X073946;
 Tue, 17 Sep 2013 01:54:13 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8H1sDho073944;
 Tue, 17 Sep 2013 01:54:13 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201309170154.r8H1sDho073944@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Tue, 17 Sep 2013 01:54:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255623 - in head/sys: amd64/conf i386/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 17 Sep 2013 01:54:14 -0000

Author: bryanv
Date: Tue Sep 17 01:54:13 2013
New Revision: 255623
URL: http://svnweb.freebsd.org/changeset/base/255623

Log:
  Add vmx(4) to i386 and amd64 GENERIC
  
  Approved by:	re (gjb)

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/i386/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Tue Sep 17 00:13:42 2013	(r255622)
+++ head/sys/amd64/conf/GENERIC	Tue Sep 17 01:54:13 2013	(r255623)
@@ -341,3 +341,5 @@ device		virtio_blk	# VirtIO Block device
 device		virtio_scsi	# VirtIO SCSI device
 device		virtio_balloon	# VirtIO Memory Balloon device
 
+# VMware support
+device		vmx		# VMware VMXNET3 Ethernet

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Tue Sep 17 00:13:42 2013	(r255622)
+++ head/sys/i386/conf/GENERIC	Tue Sep 17 01:54:13 2013	(r255623)
@@ -354,3 +354,6 @@ device		vtnet		# VirtIO Ethernet device
 device		virtio_blk	# VirtIO Block device
 device		virtio_scsi	# VirtIO SCSI device
 device		virtio_balloon	# VirtIO Memory Balloon device
+
+# VMware support
+device		vmx		# VMware VMXNET3 Ethernet