diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-30 17:43:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-30 17:43:56 -0400 |
| commit | 785824165508a65478474f0c87f6b8c3ad048c62 (patch) | |
| tree | 2b3ef81b4439cf682638aa504e29f37ef2b6da96 /net/bridge | |
| parent | ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414 (diff) | |
| parent | 768b1031dc9f3eabe3e9f603e33617a0215c12a8 (diff) | |
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/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig index ba6f73eb06c6..a9aff9c7d027 100644 --- a/net/bridge/netfilter/Kconfig +++ b/net/bridge/netfilter/Kconfig | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | menuconfig BRIDGE_NF_EBTABLES | 5 | menuconfig BRIDGE_NF_EBTABLES |
| 6 | tristate "Ethernet Bridge tables (ebtables) support" | 6 | tristate "Ethernet Bridge tables (ebtables) support" |
| 7 | depends on BRIDGE && BRIDGE_NETFILTER | 7 | depends on BRIDGE && NETFILTER |
| 8 | select NETFILTER_XTABLES | 8 | select NETFILTER_XTABLES |
| 9 | help | 9 | help |
| 10 | ebtables is a general, extensible frame/packet identification | 10 | ebtables is a general, extensible frame/packet identification |