aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/netfilter/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-07 22:27:56 -0800
committerDavid S. Miller <davem@davemloft.net>2012-03-07 22:27:56 -0800
commitc75a312d8b2c97943014261d71c6ef2622b6d0d9 (patch)
tree374a25ac277d787485dc9acf87710e28f50d52bb /net/ipv6/netfilter/Makefile
parenttcp: md5: correct a RCU lockdep splat (diff)
parentnetfilter: xt_LOG: add __printf() to sb_add() (diff)
downloadlinux-dev-c75a312d8b2c97943014261d71c6ef2622b6d0d9.tar.xz
linux-dev-c75a312d8b2c97943014261d71c6ef2622b6d0d9.zip
Merge branch 'master' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'net/ipv6/netfilter/Makefile')
-rw-r--r--net/ipv6/netfilter/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile
index 2eaed96db02c..d4dfd0a21097 100644
--- a/net/ipv6/netfilter/Makefile
+++ b/net/ipv6/netfilter/Makefile
@@ -31,5 +31,4 @@ obj-$(CONFIG_IP6_NF_MATCH_RPFILTER) += ip6t_rpfilter.o
obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o
# targets
-obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o