---

yaml --- r: 205747 b: refs/heads/master c: 8946a08 h: refs/heads/master i: 205745: 2c582d1 205743: 030d38d v: v3
git-mirror · Jun 24, 2010 · 96a0c92 · 96a0c92
1 parent 04753e3
commit 96a0c92
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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>