packages: kernel/kernel-multiarch.config, kernel/kernel-vserver.config - mo...

[arekm]

Author: arekm                        Date: Sat Oct 23 17:18:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move vserver configs to kernel-vserver.config; update config

---- Files affected:
packages/kernel:
   kernel-multiarch.config (1.47 -> 1.48) , kernel-vserver.config (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.47 packages/kernel/kernel-multiarch.config:1.48
--- packages/kernel/kernel-multiarch.config:1.47	Fri Oct 22 10:48:09 2010
+++ packages/kernel/kernel-multiarch.config	Sat Oct 23 19:18:27 2010
@@ -4635,6 +4635,8 @@
 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
 
 #-
@@ -5882,14 +5884,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 ***

================================================================
Index: packages/kernel/kernel-vserver.config
diff -u packages/kernel/kernel-vserver.config:1.4 packages/kernel/kernel-vserver.config:1.5
--- packages/kernel/kernel-vserver.config:1.4	Tue Oct  6 09:05:52 2009
+++ packages/kernel/kernel-vserver.config	Sat Oct 23 19:18:27 2010
@@ -27,9 +27,14 @@
 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 ***
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.47&r2=1.48&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver.config?r1=1.4&r2=1.5&f=u