Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 6c9cfb0d763926af284df24c4916bbbd72a5265a..a8934d8c8fda0c32a22a46919e8147ad60d748bb 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -253,6 +253,9 @@ config XPS
        depends on SMP
        default y
 
+config HWBM
+       bool
+
 config SOCK_CGROUP_DATA
        bool
        default n
@@ -360,6 +363,7 @@ source "net/can/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"
+source "net/kcm/Kconfig"
 
 config FIB_RULES
        bool
@@ -393,7 +397,7 @@ config LWTUNNEL
          with light weight tunnel state associated with fib routes.
 
 config DST_CACHE
-       bool "dst cache"
+       bool
        default n
 
 config NET_DEVLINK
@@ -403,6 +407,15 @@ config NET_DEVLINK
          infrastructure to support access to physical chip-wide config and
          monitoring.
 
+config MAY_USE_DEVLINK
+       tristate
+       default m if NET_DEVLINK=m
+       default y if NET_DEVLINK=y || NET_DEVLINK=n
+       help
+         Drivers using the devlink infrastructure should have a dependency
+         on MAY_USE_DEVLINK to ensure they do not cause link errors when
+         devlink is a loadable module and the driver using it is built-in.
+
 endif   # if NET
 
 # Used by archs to tell that they support BPF_JIT