diff --git a/[refs] b/[refs]
index b7d582576fb7..99396c89e774 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 052b1987faca3606109d88d96bce124851f7c4c2
+refs/heads/master: 31a79235fc75b506e282e43723107a40f3bc5c07
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
index d90965086fae..e76f10731a86 100644
--- a/trunk/include/linux/memcontrol.h
+++ b/trunk/include/linux/memcontrol.h
@@ -392,7 +392,7 @@ static inline void mem_cgroup_replace_page_cache(struct page *oldpage,
 				struct page *newpage)
 {
 }
-#endif /* CONFIG_CGROUP_MEM_CONT */
+#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
 
 #if !defined(CONFIG_CGROUP_MEM_RES_CTLR) || !defined(CONFIG_DEBUG_VM)
 static inline bool