diff --git a/[refs] b/[refs]
index dffa2b1cf6f0..338e254eb9e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4722a26cc61983295ad8e7a552999ec847aa0abd
+refs/heads/master: 8946a0864848fdbc6544b9e1e6cb81b7cb93026b
diff --git a/trunk/drivers/staging/zram/Kconfig b/trunk/drivers/staging/zram/Kconfig
index 5bcfe16feb19..4654ae2eb42e 100644
--- a/trunk/drivers/staging/zram/Kconfig
+++ b/trunk/drivers/staging/zram/Kconfig
@@ -1,5 +1,6 @@
 config ZRAM
 	tristate "Compressed RAM block device support"
+	depends on BLOCK
 	select LZO_COMPRESS
 	select LZO_DECOMPRESS
 	default n
diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c
index 3f778434dc9b..77d4d715a789 100644
--- a/trunk/drivers/staging/zram/zram_drv.c
+++ b/trunk/drivers/staging/zram/zram_drv.c
@@ -17,6 +17,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/bio.h>
 #include <linux/bitops.h>
 #include <linux/blkdev.h>
 #include <linux/buffer_head.h>