diff --git a/[refs] b/[refs]
index 26a3a681b6dc..875de226601e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f943cbe6fb71d1389dd8684b9b4181e49f8e870c
+refs/heads/master: 888bdaa9b2c426dcca214e6efd388080938082cb
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
index 1513994ce207..9b296ea41bb8 100644
--- a/trunk/include/linux/memcontrol.h
+++ b/trunk/include/linux/memcontrol.h
@@ -384,13 +384,13 @@ mem_cgroup_print_bad_page(struct page *page)
 }
 #endif
 
-#ifdef CONFIG_INET
 enum {
 	UNDER_LIMIT,
 	SOFT_LIMIT,
 	OVER_LIMIT,
 };
 
+#ifdef CONFIG_INET
 struct sock;
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
 void sock_update_memcg(struct sock *sk);