V4L/DVB (5836): dvb-ttpci: re-initialize aspect ratio and pan scan after arm crash

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 1e198b8c69360e447c0b12d705b008d1e032482f..e2056828dc64159474cf44b3037e5b2bda54663f 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -209,6 +209,15 @@ config TASK_IO_ACCOUNTING
 
          Say N if unsure.
 
+config USER_NS
+       bool "User Namespaces (EXPERIMENTAL)"
+       default n
+       depends on EXPERIMENTAL
+       help
+         Support user namespaces.  This allows containers, i.e.
+         vservers, to use user namespaces to provide different
+         user info for different servers.  If unsure, say N.
+
 config AUDIT
        bool "Auditing support"
        depends on NET
@@ -537,7 +546,7 @@ config SLUB_DEBUG
 
 choice
        prompt "Choose SLAB allocator"
-       default SLAB
+       default SLUB
        help
           This option allows to select a slab allocator.