Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6] / kernel / ns_cgroup.c

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