From 5cb3e151ef49243e08090792d2ed41cb1d336d65 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Tue, 26 Jun 2012 16:50:31 +0800
Subject: [PATCH] --- yaml --- r: 317770 b: refs/heads/master c:
 f64d94f9f7536842a120f6eef4cfd4cfcd516f5e h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/zcache/zcache-main.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b3c2e22b3325..bc35540db199 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a16554474f772ea857bf193608231a735e01cccc
+refs/heads/master: f64d94f9f7536842a120f6eef4cfd4cfcd516f5e
diff --git a/trunk/drivers/staging/zcache/zcache-main.c b/trunk/drivers/staging/zcache/zcache-main.c
index 58e7bd432508..36c3b05926e3 100644
--- a/trunk/drivers/staging/zcache/zcache-main.c
+++ b/trunk/drivers/staging/zcache/zcache-main.c
@@ -36,9 +36,6 @@
 
 #include "../zsmalloc/zsmalloc.h"
 
-#if (!defined(CONFIG_CLEANCACHE) && !defined(CONFIG_FRONTSWAP))
-#error "zcache is useless without CONFIG_CLEANCACHE or CONFIG_FRONTSWAP"
-#endif
 #ifdef CONFIG_CLEANCACHE
 #include <linux/cleancache.h>
 #endif
@@ -2028,7 +2025,7 @@ static int __init zcache_init(void)
 		goto out;
 	}
 #endif /* CONFIG_SYSFS */
-#if defined(CONFIG_CLEANCACHE) || defined(CONFIG_FRONTSWAP)
+
 	if (zcache_enabled) {
 		unsigned int cpu;
 
@@ -2059,7 +2056,7 @@ static int __init zcache_init(void)
 		pr_err("zcache: can't create client\n");
 		goto out;
 	}
-#endif
+
 #ifdef CONFIG_CLEANCACHE
 	if (zcache_enabled && use_cleancache) {
 		struct cleancache_ops old_ops;