diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -97,7 +97,7 @@
 BPF_JITTER		opt_bpf.h
 
 # Hyper-V support
-HYPERV			opt_hyperv.h
+DEV_HYPERV		opt_hyperv.h
 
 XENHVM			opt_global.h
 
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -327,8 +327,6 @@
 device		kvm_clock		# KVM paravirtual clock driver
 
 # HyperV drivers and enhancement support
-# NOTE: HYPERV depends on hyperv.  They must be added or removed together.
-options 	HYPERV			# Kernel support for HyperV drivers
 device		hyperv			# HyperV drivers
 
 # Xen HVM Guest Optimizations
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -660,7 +660,6 @@
 # Google Virtual NIC
 device		gve		# Google Virtual NIC (gVNIC) driver
 
-options 	HYPERV
 device		hyperv		# HyperV drivers
 device		hvhid		# HyperV HID device
 
diff --git a/sys/i386/i386/exception.S b/sys/i386/i386/exception.S
--- a/sys/i386/i386/exception.S
+++ b/sys/i386/i386/exception.S
@@ -450,7 +450,7 @@
 #include <i386/i386/apic_vector.S>
 #endif
 
-#ifdef HYPERV
+#ifdef DEV_HYPERV
 	.data
 	.p2align 4
 	.text