diff --git a/[refs] b/[refs]
index 39bf227e7818..c38021caf884 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36b77a52087a9fca4228c06e0730750f9b6468f0
+refs/heads/master: c607b2ed84929e143d9fb5653c4b5d0109147cde
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 6fe0dae81451..3144c7950649 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -66,8 +66,20 @@
 
 struct cgroup;
 struct cgroup_subsys;
+#ifdef CONFIG_NET
 int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss);
 void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss);
+#else
+static inline
+int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss)
+{
+	return 0;
+}
+static inline
+void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss)
+{
+}
+#endif
 /*
  * This structure really needs to be cleaned up.
  * Most of it is for TCP, and not used by any of