Merge tag 'bcm2835-dt-next-2016-04-20' into devicetree/next

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

diff --git a/net/Kconfig b/net/Kconfig
index 10640d5f8beefd84d41b8d3eff2758c3757e9f6b..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
@@ -394,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