brcm2708: fix kmod-sound-soc-bcm2708-i2s config

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

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 6bf65f5bc0da7c15707aa2bfc5d70dfdcd586ac2..2572bf45ef44421752b9b6c65eab4276335fb26b 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -127,6 +127,23 @@ config KERNEL_EARLY_PRINTK
          debugging purposes to send messages over the serial console in early boot.
          Enable this to debug early boot problems.
 
+config KERNEL_KPROBES
+       bool "Compile the kernel with kprobes support"
+       default n
+       select KERNEL_FTRACE
+       select KERNEL_PERF_EVENTS
+       help
+         Compiles the kernel with KPROBES support, which allows you to trap
+         at almost any kernel address and execute a callback function.
+         register_kprobe() establishes a probepoint and specifies the
+         callback. Kprobes is useful for kernel debugging, non-intrusive
+         instrumentation and testing.
+         If in doubt, say "N".
+
+config KERNEL_KPROBE_EVENT
+       bool
+       default y if KERNEL_KPROBES
+
 config KERNEL_AIO
        bool "Compile the kernel with asynchronous IO support"
        default n
@@ -283,7 +300,7 @@ if KERNEL_CGROUPS
        config KERNEL_MEMCG
                bool "Memory Resource Controller for Control Groups"
                default n
-               depends on KERNEL_RESOURCE_COUNTERS
+               depends on KERNEL_RESOURCE_COUNTERS || !LINUX_3_18
                help
                  Provides a memory resource controller that manages both anonymous
                  memory and page cache. (See Documentation/cgroups/memory.txt)
@@ -516,16 +533,14 @@ if KERNEL_LXC_MISC
 
 endif
 
+config KERNEL_SECCOMP_FILTER
+       bool
+       default n
+
 config KERNEL_SECCOMP
        bool "Enable seccomp support"
                depends on !(TARGET_uml)
+               select KERNEL_SECCOMP_FILTER
                default n
                help
                  Build kernel with support for seccomp.
-
-config KERNEL_SECCOMP_FILTER
-       bool "Enable seccomp filter support"
-               depends on KERNEL_SECCOMP
-               default n
-               help
-                 Build kernel with support for seccomp BPF programs.