diff --git a/[refs] b/[refs]
index ca2b3fb124e9..31e26ead8d36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fee7e168ba08ed067ee9aafe4a0a19387117be4
+refs/heads/master: bec25dfd850cf92cba894c94d6660fc18d3a7447
diff --git a/trunk/drivers/staging/zcache/Kconfig b/trunk/drivers/staging/zcache/Kconfig
index 5a36fcfd87c0..3ed2c8f656a5 100644
--- a/trunk/drivers/staging/zcache/Kconfig
+++ b/trunk/drivers/staging/zcache/Kconfig
@@ -1,5 +1,5 @@
 config ZCACHE
-	tristate "Dynamic compression of swap pages and clean pagecache pages"
+	bool "Dynamic compression of swap pages and clean pagecache pages"
 	# X86 dependency is because zsmalloc uses non-portable pte/tlb
 	# functions
 	depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86