diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-10 14:50:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-10 14:50:02 -0500 |
| commit | ef8570d859a5872db525ec1464165352e4f2bdaa (patch) | |
| tree | 272758d4f1324294ed0eb66b416aeb5faca2d342 /net/netfilter/Makefile | |
| parent | 11b57f90257c1d6a91cee720151b69e0c2020cf6 (diff) | |
| parent | 74f77a6b2b1c98d3f14364dccdd2353b99ecfeda (diff) | |
| download | op-kernel-dev-ef8570d859a5872db525ec1464165352e4f2bdaa.zip op-kernel-dev-ef8570d859a5872db525ec1464165352e4f2bdaa.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
This batch contains one single patch with the l2tp match
for xtables, from James Chapman.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/Makefile')
| -rw-r--r-- | net/netfilter/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index 74c0661..ee9c4de 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -138,6 +138,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o obj-$(CONFIG_NETFILTER_XT_MATCH_IPCOMP) += xt_ipcomp.o obj-$(CONFIG_NETFILTER_XT_MATCH_IPRANGE) += xt_iprange.o obj-$(CONFIG_NETFILTER_XT_MATCH_IPVS) += xt_ipvs.o +obj-$(CONFIG_NETFILTER_XT_MATCH_L2TP) += xt_l2tp.o obj-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += xt_length.o obj-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += xt_limit.o obj-$(CONFIG_NETFILTER_XT_MATCH_MAC) += xt_mac.o |
