Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 4051fdf..d6b138e 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -176,10 +176,11 @@ config NETFILTER_ADVANCED
          If unsure, say Y.
 
 config BRIDGE_NETFILTER
-       bool "Bridged IP/ARP packets filtering"
-       depends on BRIDGE && NETFILTER && INET
+       tristate "Bridged IP/ARP packets filtering"
+       depends on BRIDGE
+       depends on NETFILTER && INET
        depends on NETFILTER_ADVANCED
-       default y
+       default m
        ---help---
          Enabling this option will let arptables resp. iptables see bridged
          ARP resp. IP traffic. If you want a bridging firewall, you probably