From owner-svn-src-all@FreeBSD.ORG  Thu Sep 19 05:07:52 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 05CAC7A7;
 Thu, 19 Sep 2013 05:07:52 +0000 (UTC)
 (envelope-from grehan@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 E862B2139;
 Thu, 19 Sep 2013 05:07:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8J57pql013788;
 Thu, 19 Sep 2013 05:07:51 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8J57pJe013787;
 Thu, 19 Sep 2013 05:07:51 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201309190507.r8J57pJe013787@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Thu, 19 Sep 2013 05:07:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255692 - head/sys/amd64/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: Thu, 19 Sep 2013 05:07:52 -0000

Author: grehan
Date: Thu Sep 19 05:07:51 2013
New Revision: 255692
URL: http://svnweb.freebsd.org/changeset/base/255692

Log:
  Reconnect the hyperv drivers back into GENERIC now that the
  disengage driver issue has been resolved.
  
  Approved by:	re@ (gjb)

Modified:
  head/sys/amd64/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Thu Sep 19 04:59:44 2013	(r255691)
+++ head/sys/amd64/conf/GENERIC	Thu Sep 19 05:07:51 2013	(r255692)
@@ -341,5 +341,8 @@ 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 
+
 # VMware support
 device		vmx		# VMware VMXNET3 Ethernet