Index: sys/conf/files.i386
===================================================================
--- sys/conf/files.i386	(revision 258912)
+++ sys/conf/files.i386	(working copy)
@@ -221,6 +221,18 @@
 dev/hwpmc/hwpmc_ppro.c		optional hwpmc
 dev/hwpmc/hwpmc_tsc.c		optional hwpmc
 dev/hwpmc/hwpmc_x86.c		optional hwpmc
+dev/hyperv/netvsc/hv_net_vsc.c                          optional        hyperv
+dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c               optional        hyperv
+dev/hyperv/netvsc/hv_rndis_filter.c                     optional        hyperv
+dev/hyperv/stordisengage/hv_ata_pci_disengage.c         optional        hyperv
+dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c             optional        hyperv
+dev/hyperv/utilities/hv_util.c                          optional        hyperv
+dev/hyperv/vmbus/hv_channel.c                           optional        hyperv
+dev/hyperv/vmbus/hv_channel_mgmt.c                      optional        hyperv
+dev/hyperv/vmbus/hv_connection.c                        optional        hyperv
+dev/hyperv/vmbus/hv_hv.c                                optional        hyperv
+dev/hyperv/vmbus/hv_ring_buffer.c                       optional        hyperv
+dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c                 optional        hyperv
 dev/ichwd/ichwd.c		optional ichwd
 dev/if_ndis/if_ndis.c		optional ndis
 dev/if_ndis/if_ndis_pccard.c	optional ndis pccard
Index: sys/i386/conf/GENERIC
===================================================================
--- sys/i386/conf/GENERIC	(revision 258912)
+++ sys/i386/conf/GENERIC	(working copy)
@@ -346,6 +346,9 @@
 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