- move vserver configs to kernel-vserver.config; update config

Changed files:
    kernel-multiarch.config -> 1.48
    kernel-vserver.config -> 1.5

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index ca6e0226088853c3f91a748b07975bec1f342534..7e3bafb47ed0ef126d277f8c0a3db3c05614727b 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -4635,6 +4635,8 @@ USB_G_MULTI_RNDIS all=y
 USB_G_MULTI_CDC all=y
 USB_G_HID all=m
 USB_G_DBGP all=m
+USB_G_DBGP_PRINTK all=y
+USB_G_DBGP_SERIAL all=n
 USB_G_WEBCAM all=m
 
 #-
@@ -5883,14 +5885,6 @@ FTRACE_STARTUP_TEST all=n
 MMIOTRACE x86=n
 RING_BUFFER_BENCHMARK all=m
 
-#-
-#- *** FILE: kernel/vserver/Kconfig ***
-#-
-VSERVER_LEGACY_MEM all=y
-QUOTES_ISO8859 all=y
-QUOTES_UTF8 all=n
-QUOTES_ASCII all=n
-
 #-
 #- *** FILE: lib/Kconfig ***
 #-

diff --git a/kernel-vserver.config b/kernel-vserver.config
index 47bdbfbb01ab156e5dc92112fd03c53db15dd680..b2cb3dd3178d4c232bf06374b608dbe75517db01 100644 (file)
--- a/kernel-vserver.config
+++ b/kernel-vserver.config
@@ -27,9 +27,14 @@ CONFIG_TAG_NFSD all=n
 CONFIG_VSERVER_PRIVACY all=y
 CONFIG_VSERVER_CONTEXTS all=256 alpha=768 ia64=768 ppc64=768 sparc64=768 x86_64=768
 CONFIG_VSERVER_WARN all=y
+CONFIG_VSERVER_WARN_DEVPTS all=y
 CONFIG_VSERVER_DEBUG all=n
 CONFIG_VSERVER all=y
 CONFIG_VSERVER_SECURITY all=y
+CONFIG_VSERVER_LEGACY_MEM all=y
+CONFIG_QUOTES_ISO8859 all=y
+CONFIG_QUOTES_UTF8 all=n
+CONFIG_QUOTES_ASCII all=n
 
 #-
 #- *** FILE: net/Kconfig ***