2 files changed, 4 insertions, 3 deletions

diff --git a/net/Kconfig b/net/Kconfig
index dc5d700d05e7..d6b138e2c263 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -177,7 +177,7 @@ config NETFILTER_ADVANCED
 
 config BRIDGE_NETFILTER
         tristate "Bridged IP/ARP packets filtering"
-        depends on (BRIDGE || BRIDGE=n)
+        depends on BRIDGE
         depends on NETFILTER && INET
         depends on NETFILTER_ADVANCED
         default m
diff --git a/net/bridge/Makefile b/net/bridge/Makefile
index 5e3eac5dc8b9..fd7ee03c59b3 100644
--- a/net/bridge/Makefile
+++ b/net/bridge/Makefile
@@ -6,11 +6,12 @@ obj-$(CONFIG_BRIDGE) += bridge.o
 
 bridge-y        := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
                         br_ioctl.o br_stp.o br_stp_bpdu.o \
-                        br_stp_if.o br_stp_timer.o br_netlink.o \
-                        br_nf_core.o
+                        br_stp_if.o br_stp_timer.o br_netlink.o
 
 bridge-$(CONFIG_SYSFS) += br_sysfs_if.o br_sysfs_br.o
 
+bridge-$(subst m,y,$(CONFIG_BRIDGE_NETFILTER)) += br_nf_core.o
+
 obj-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o
 
 bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o br_mdb.o