This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / autoconf.h

diff --git a/include/linux/autoconf.h b/include/linux/autoconf.h
index 546d521..c480636 100644 (file)
--- a/include/linux/autoconf.h
+++ b/include/linux/autoconf.h
@@ -2297,6 +2297,18 @@
 #define CONFIG_X86_FIND_SMP_CONFIG 1
 #define CONFIG_X86_MPPARSE 1
 
+/*
+ * Linux VServer
+ */
+#define CONFIG_VSERVER_LEGACY 1
+#define CONFIG_PROC_SECURE 1
+#undef CONFIG_VSERVER_HARDCPU
+#undef CONFIG_INOXID_NONE
+#undef CONFIG_INOXID_GID16
+#define CONFIG_INOXID_GID24 1
+#undef CONFIG_INOXID_GID32
+#undef CONFIG_INOXID_MAGIC
+
 /*
  * Security options
  */