Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / net / bridge / Makefile

diff --git a/net/bridge/Makefile b/net/bridge/Makefile
index 5e3eac5dc8b9006a6dc8d146b017380debc41bc2..fd7ee03c59b3f6c891fe9b5020b08af389d3e814 100644 (file)
--- 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