git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge to VServer 1.9.0
[linux-2.6.git] / arch / i386 / Kconfig
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index c46596c..75ee137 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1345,6 +1345,8 @@ config X86_MPPARSE
 
 endmenu
 
+source "kernel/vserver/Kconfig"
+
 source "security/Kconfig"
 
 source "crypto/Kconfig"
linux-2.6