diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig
index 4a1f4f1b5c94..40447020a790 100644
--- a/drivers/staging/hv/Kconfig
+++ b/drivers/staging/hv/Kconfig
@@ -6,23 +6,27 @@ config HYPERV
 	  Select this option to run Linux as a Hyper-V client operating
 	  system.
 
+if HYPERV
+
 config HYPERV_STORAGE
 	tristate "Microsoft Hyper-V virtual storage driver"
-	depends on SCSI && m
-	default n
+	depends on SCSI
+	default HYPERV
 	help
 	 Select this option to enable the Hyper-V virtual storage driver.
 
 config HYPERV_BLOCK
 	tristate "Microsoft Hyper-V virtual block driver"
-	depends on BLOCK && SCSI && m
-	default n
+	depends on BLOCK && SCSI
+	default HYPERV
 	help
 	  Select this option to enable the Hyper-V virtual block driver.
 
 config HYPERV_NET
 	tristate "Microsoft Hyper-V virtual network driver"
-	depends on NET && m
-	default n
+	depends on NET
+	default HYPERV
 	help
 	  Select this option to enable the Hyper-V virtual network driver.
+
+endif