Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

[~andy/linux] / net / bridge / Makefile

diff --git a/net/bridge/Makefile b/net/bridge/Makefile
index f444c12cde5a66d0cf864ef2238de8307d8b2707..d0359ea8ee7901472adee37ff9f22e62d51ce585 100644 (file)
--- a/net/bridge/Makefile
+++ b/net/bridge/Makefile
@@ -12,4 +12,6 @@ bridge-$(CONFIG_SYSFS) += br_sysfs_if.o br_sysfs_br.o
 
 bridge-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o
 
+bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o
+
 obj-$(CONFIG_BRIDGE_NF_EBTABLES) += netfilter/