Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index b50dacc072f0026416490e534f7f6c14fa624724..0715db64a5c3dd7ea0cd12f09c3fe62ee8385f3a 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -220,6 +220,7 @@ source "net/openvswitch/Kconfig"
 source "net/vmw_vsock/Kconfig"
 source "net/netlink/Kconfig"
 source "net/mpls/Kconfig"
+source "net/hsr/Kconfig"
 
 config RPS
        boolean