hostapd: make "key" option optional if "wpa_psk_file" is provided

[openwrt/staging/rmilecki.git] / config / Config-kernel.in

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index f6464b7574cf15a262be98c3a48825146e76cc69..2e80c8f5371372fc3874e5cf3d29959e5bfab598 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -360,6 +360,18 @@ config KERNEL_BLK_DEV_BSG
 config KERNEL_TRANSPARENT_HUGEPAGE
        bool
 
+choice
+       prompt "Transparent Hugepage Support sysfs defaults"
+       depends on KERNEL_TRANSPARENT_HUGEPAGE
+       default KERNEL_TRANSPARENT_HUGEPAGE_ALWAYS
+
+       config KERNEL_TRANSPARENT_HUGEPAGE_ALWAYS
+               bool "always"
+
+       config KERNEL_TRANSPARENT_HUGEPAGE_MADVISE
+               bool "madvise"
+endchoice
+
 config KERNEL_HUGETLBFS
        bool
 
@@ -795,6 +807,10 @@ if KERNEL_CGROUPS
                bool "legacy Control Group Classifier"
                default n
 
+       config KERNEL_CGROUP_NET_CLASSID
+               bool "legacy Network classid cgroup"
+               default n
+
        config KERNEL_CGROUP_NET_PRIO
                bool "legacy Network priority cgroup"
                default n