Merge tag 'staging-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index efe930db3c08d62e190c3b74f4121d29afc4a61e..0428f12c25c2fc0cda29bf32065265094534f5f8 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -182,6 +182,7 @@ config BRIDGE_NETFILTER
        depends on BRIDGE
        depends on NETFILTER && INET
        depends on NETFILTER_ADVANCED
+       select NETFILTER_FAMILY_BRIDGE
        default m
        ---help---
          Enabling this option will let arptables resp. iptables see bridged
@@ -212,7 +213,6 @@ source "net/dsa/Kconfig"
 source "net/8021q/Kconfig"
 source "net/decnet/Kconfig"
 source "net/llc/Kconfig"
-source "net/ipx/Kconfig"
 source "drivers/net/appletalk/Kconfig"
 source "net/x25/Kconfig"
 source "net/lapb/Kconfig"