---

yaml --- r: 363304 b: refs/heads/master c: 7791c62 h: refs/heads/master v: v3
git-mirror · Mar 7, 2013 · aa58360 · aa58360
1 parent c6fb8aa
commit aa58360
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9f5b8145af9a0ee34e98cf01dcd3afb87225538
+refs/heads/master: 7791c623b3826ab9dac6fe0bca770776a5e6c4ce
diff --git a/trunk/drivers/staging/zcache/Kconfig b/trunk/drivers/staging/zcache/Kconfig
@@ -13,7 +13,6 @@ config ZCACHE
 config ZCACHE_DEBUG
 	bool "Enable debug statistics"
 	depends on DEBUG_FS && ZCACHE
-	depends on BROKEN
 	default n
 	help
 	  This is used to provide an debugfs directory with counters of

diff --git a/trunk/drivers/staging/zcache/debug.h b/trunk/drivers/staging/zcache/debug.h
@@ -1,3 +1,5 @@
+#include <linux/bug.h>
+
 #ifdef CONFIG_ZCACHE_DEBUG
 
 /* we try to keep these statistics SMP-consistent */