diff --git a/[refs] b/[refs]
index c613e84d8dc7..d7544d67e0a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af498d7fa3e786f52650819a56e117ed9a40920c
+refs/heads/master: 05dc7b613481c695bb4fc476c6fbb46364b63f62
diff --git a/trunk/arch/powerpc/platforms/iseries/Kconfig b/trunk/arch/powerpc/platforms/iseries/Kconfig
index 647e87787437..47a20cfb4486 100644
--- a/trunk/arch/powerpc/platforms/iseries/Kconfig
+++ b/trunk/arch/powerpc/platforms/iseries/Kconfig
@@ -17,6 +17,7 @@ config VIODASD
 
 config VIOCD
 	tristate "iSeries Virtual I/O CD support"
+	depends on BLOCK
 	select VIOPATH
 	help
 	  If you are running Linux on an IBM iSeries system and you want to