aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-08-30 17:43:56 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-30 17:43:56 -0400
commit785824165508a65478474f0c87f6b8c3ad048c62 (patch)
tree2b3ef81b4439cf682638aa504e29f37ef2b6da96 /net/bridge
parentec0506dbe4e240ecd4c32bf74c84a88ce1ddb414 (diff)
parent768b1031dc9f3eabe3e9f603e33617a0215c12a8 (diff)
downloadkernel_goldelico_gta04-785824165508a65478474f0c87f6b8c3ad048c62.zip
kernel_goldelico_gta04-785824165508a65478474f0c87f6b8c3ad048c62.tar.gz
kernel_goldelico_gta04-785824165508a65478474f0c87f6b8c3ad048c62.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/netfilter/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
index ba6f73e..a9aff9c 100644
--- a/net/bridge/netfilter/Kconfig
+++ b/net/bridge/netfilter/Kconfig
@@ -4,7 +4,7 @@
menuconfig BRIDGE_NF_EBTABLES
tristate "Ethernet Bridge tables (ebtables) support"
- depends on BRIDGE && BRIDGE_NETFILTER
+ depends on BRIDGE && NETFILTER
select NETFILTER_XTABLES
help
ebtables is a general, extensible frame/packet identification