diff --git a/[refs] b/[refs]
index f4121a90717e..c0022f1228b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79e5cdb208aaf5e7ead5c98b08a31ce6d604fead
+refs/heads/master: e1415db7b6f216d4344db028581227e828a38eca
diff --git a/trunk/drivers/staging/hv/Kconfig b/trunk/drivers/staging/hv/Kconfig
index 4a1f4f1b5c94..40447020a790 100644
--- a/trunk/drivers/staging/hv/Kconfig
+++ b/trunk/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