diff --git a/[refs] b/[refs]
index 25eac0f62e94..676e36511da4 100644
--- 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
index ad47b4b8f04b..2da6cc444c7e 100644
--- 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
index eef67dbe78d8..4bbe49b73d49 100644
--- 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 */