Merge branch 'rds-buffer-tuning'

[deliverable/linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 2760825e53fa4e2404571d34c98c965e2b46b9cb..e13449870d0684dc3266945158b6ede5c340c146 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