diff --git a/[refs] b/[refs]
index a8f9cfbdd73f..ec16698c7f7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02ab851324dc7e2fc75787f7fae71187092be7ed
+refs/heads/master: aa8b83cb0b48e3cac58a3b75ad9c556564c5fe9d
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index 31be3ac2e21b..e023682be2c4 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -669,7 +669,7 @@ config VIRTIO_CONSOLE
 
 config HVCS
 	tristate "IBM Hypervisor Virtual Console Server support"
-	depends on PPC_PSERIES
+	depends on PPC_PSERIES && HVC_CONSOLE
 	help
 	  Partitionable IBM Power5 ppc64 machines allow hosting of
 	  firmware virtual consoles from one Linux partition by