projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-john' of git://x-git.kernel.org/pub/scm/linux/kernel/git/jberg...
[cascardo/linux.git]
/
net
/
bridge
/
Makefile
diff --git
a/net/bridge/Makefile
b/net/bridge/Makefile
index
e859098
..
e85498b
100644
(file)
--- a/
net/bridge/Makefile
+++ b/
net/bridge/Makefile
@@
-14,4
+14,6
@@
bridge-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o
bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o br_mdb.o
+bridge-$(CONFIG_BRIDGE_VLAN_FILTERING) += br_vlan.o
+
obj-$(CONFIG_BRIDGE_NF_EBTABLES) += netfilter/