Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / kernel / ns_cgroup.c

diff --git a/kernel/ns_cgroup.c b/kernel/ns_cgroup.c
index aead4d69f62b80f0cf648eb8213bc633caf6d8de..48d7ed6fc3a4d2dcc206d5eb304f55ae7436ac70 100644 (file)
--- a/kernel/ns_cgroup.c
+++ b/kernel/ns_cgroup.c
@@ -7,6 +7,8 @@
 #include <linux/module.h>
 #include <linux/cgroup.h>
 #include <linux/fs.h>
+#include <linux/slab.h>
+#include <linux/nsproxy.h>
 
 struct ns_cgroup {
        struct cgroup_subsys_state css;