diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /net/bridge/Makefile | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'net/bridge/Makefile')
| -rw-r--r-- | net/bridge/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/Makefile b/net/bridge/Makefile index f444c12cde5a..d0359ea8ee79 100644 --- a/net/bridge/Makefile +++ b/net/bridge/Makefile | |||
| @@ -12,4 +12,6 @@ bridge-$(CONFIG_SYSFS) += br_sysfs_if.o br_sysfs_br.o | |||
| 12 | 12 | ||
| 13 | bridge-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o | 13 | bridge-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o |
| 14 | 14 | ||
| 15 | bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o | ||
| 16 | |||
| 15 | obj-$(CONFIG_BRIDGE_NF_EBTABLES) += netfilter/ | 17 | obj-$(CONFIG_BRIDGE_NF_EBTABLES) += netfilter/ |