[generic] enable NF_CONNTRACK_PROCFS for Linux 3.3, required for /proc/net/nf_conntra...

[openwrt/svn-archive/archive.git] / Config.in

diff --git a/Config.in b/Config.in
index 736a97282fc198a9bed0d80ed8e0b7e2f4dd7866..c288cfbec19fa340853b78cf122a275f7af14097 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -46,9 +46,16 @@ menu "Target Images"
 
                        config TARGET_INITRAMFS_COMPRESSION_XZ
                                bool "xz"
 
                        config TARGET_INITRAMFS_COMPRESSION_XZ
                                bool "xz"

-                               depends LINUX_2_6_38
+                               depends !LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32&&!LINUX_2_6_36&&!LINUX_2_6_37

                endchoice
 
                endchoice
 

+               config EXTERNAL_CPIO
+                       string
+                       prompt "Use external cpio" if TARGET_ROOTFS_INITRAMFS
+                       default ""
+                       help
+                         Kernel uses specified external cpio as INITRAMFS_SOURCE
+

        comment "Root filesystem archives"
 
        config TARGET_ROOTFS_CPIOGZ
        comment "Root filesystem archives"
 
        config TARGET_ROOTFS_CPIOGZ


@@ -145,7 +152,7 @@ menu "Global build settings"
                bool "Compile with full language support"
                help
                  When this option is enabled, packages are built with the full versions of iconv and GNU gettext
                bool "Compile with full language support"
                help
                  When this option is enabled, packages are built with the full versions of iconv and GNU gettext

-                 instead of the default OpenWrt stubs.
+                 instead of the default OpenWrt stubs. If uClibc is used, it is also built with locale support.

 
        config SHADOW_PASSWORDS
                bool
 
        config SHADOW_PASSWORDS
                bool


@@ -229,7 +236,7 @@ menu "Global build settings"
 
        config KERNEL_MAGIC_SYSRQ
                bool "Compile the kernel with SysRq support"
 
        config KERNEL_MAGIC_SYSRQ
                bool "Compile the kernel with SysRq support"

-               default n
+               default y

 
        config KERNEL_ELF_CORE
                bool "Enable process core dump support"
 
        config KERNEL_ELF_CORE
                bool "Enable process core dump support"