diff options
| author | David S. Miller | 2008-04-14 12:50:43 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-04-14 12:50:43 +0200 |
| commit | 334f8b2afd9652e20f67ddee4fec483ed860425b (patch) | |
| tree | 35d4fb46a9dc145e831fe5da026f2bfd9ee6657c /net/bridge/netfilter/Makefile | |
| parent | [SOCK]: Add some notes about per-bind-bucket sock lookup. (diff) | |
| parent | [NETFILTER]: nf_conntrack: fix incorrect check for expectations (diff) | |
| download | kernel-qcow2-linux-334f8b2afd9652e20f67ddee4fec483ed860425b.tar.gz kernel-qcow2-linux-334f8b2afd9652e20f67ddee4fec483ed860425b.tar.xz kernel-qcow2-linux-334f8b2afd9652e20f67ddee4fec483ed860425b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.26
Diffstat (limited to 'net/bridge/netfilter/Makefile')
| -rw-r--r-- | net/bridge/netfilter/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/netfilter/Makefile b/net/bridge/netfilter/Makefile index 905087e0d485..83715d73a503 100644 --- a/net/bridge/netfilter/Makefile +++ b/net/bridge/netfilter/Makefile @@ -30,3 +30,4 @@ obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o # watchers obj-$(CONFIG_BRIDGE_EBT_LOG) += ebt_log.o obj-$(CONFIG_BRIDGE_EBT_ULOG) += ebt_ulog.o +obj-$(CONFIG_BRIDGE_EBT_NFLOG) += ebt_nflog.o |