From owner-svn-src-stable@FreeBSD.ORG  Mon Dec 16 06:41:32 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 ESMTPS id 4A42417E;
 Mon, 16 Dec 2013 06:41:32 +0000 (UTC)
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 356DF1CC6;
 Mon, 16 Dec 2013 06:41:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG6fWGL098453;
 Mon, 16 Dec 2013 06:41:32 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG6fWiY098452;
 Mon, 16 Dec 2013 06:41:32 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201312160641.rBG6fWiY098452@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 16 Dec 2013 06:41:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r259450 - stable/10/sys/i386/conf
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Dec 2013 06:41:32 -0000

Author: delphij
Date: Mon Dec 16 06:41:31 2013
New Revision: 259450
URL: http://svnweb.freebsd.org/changeset/base/259450

Log:
  MFC r258950:
  
  Enable Hyper-V support in i386 GENERIC.

Modified:
  stable/10/sys/i386/conf/GENERIC
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/i386/conf/GENERIC
==============================================================================
--- stable/10/sys/i386/conf/GENERIC	Mon Dec 16 02:30:56 2013	(r259449)
+++ stable/10/sys/i386/conf/GENERIC	Mon Dec 16 06:41:31 2013	(r259450)
@@ -346,6 +346,9 @@ device		virtio_blk	# VirtIO Block device
 device		virtio_scsi	# VirtIO SCSI device
 device		virtio_balloon	# VirtIO Memory Balloon device
 
+# HyperV drivers
+device		hyperv		# HyperV drivers 
+
 # Xen HVM Guest Optimizations
 # NOTE: XENHVM depends on xenpci.  They must be added or removed together.
 options 	XENHVM		# Xen HVM kernel infrastructure