apm821xx: backport crypto4xx patches from 4.15

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

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 3468899adc786e770f5519f1056985398db12d71..fa06b5044219f5080bafce8fe7596dad00a0a708 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -254,7 +254,7 @@ config KERNEL_DEVTMPFS
        default n
        help
          devtmpfs is a simple, kernel-managed /dev filesystem. The kernel creates
-         devices nodes for all registered devices ti simplify boot, but leaves more
+         devices nodes for all registered devices to simplify boot, but leaves more
          complex tasks to userspace (e.g. udev).
 
 if KERNEL_DEVTMPFS
@@ -607,6 +607,17 @@ config KERNEL_SECCOMP
                help
                  Build kernel with support for seccomp.
 
+#
+# IPv4 configuration
+#
+
+config KERNEL_IP_MROUTE
+       bool "Enable IPv4 multicast routing"
+       default y
+       help
+         Multicast routing requires a multicast routing daemon in
+         addition to kernel support.
+
 #
 # IPv6 configuration
 #
@@ -623,7 +634,11 @@ if KERNEL_IPV6
                def_bool y
 
        config KERNEL_IPV6_MROUTE
-               def_bool y
+               bool "Enable IPv6 multicast routing"
+               default y
+               help
+                 Multicast routing requires a multicast routing daemon in
+                 addition to kernel support.
 
        config KERNEL_IPV6_PIMSM_V2
                def_bool n