netfilter: fix several Kconfig problems in NF_LOG_*
authorPablo Neira Ayuso <pablo@netfilter.org>
Sat, 28 Jun 2014 16:39:01 +0000 (18:39 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sat, 28 Jun 2014 16:49:49 +0000 (18:49 +0200)
warning: (NETFILTER_XT_TARGET_LOG) selects NF_LOG_IPV6 which has unmet direct dependencies (NET && INET && IPV6 && NETFILTER && IP6_NF_IPTABLES && NETFILTER_ADVANCED)
warning: (NF_LOG_IPV4 && NF_LOG_IPV6) selects NF_LOG_COMMON which has unmet direct dependencies (NET && INET && NETFILTER && NF_CONNTRACK)

Fixes: 83e96d4 ("netfilter: log: split family specific code to nf_log_{ip,ip6,common}.c files")
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/ipv4/netfilter/Kconfig
net/ipv6/netfilter/Kconfig
net/netfilter/Kconfig

Simple merge
Simple merge
Simple merge