diff --git a/[refs] b/[refs] index 096fcdab8b3c..7d82350d09a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d191854282fd831da785a5a34bc6fd16049b8578 +refs/heads/master: bc94b52167596e4f9c0a020c10e2f49b04a2e48b diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig index f6275a0f1ea7..f8ac4ef0b794 100644 --- a/trunk/net/netfilter/Kconfig +++ b/trunk/net/netfilter/Kconfig @@ -908,7 +908,7 @@ config NETFILTER_XT_MATCH_MULTIPORT config NETFILTER_XT_MATCH_NFACCT tristate '"nfacct" match support' - default m if NETFILTER_ADVANCED=n + depends on NETFILTER_ADVANCED select NETFILTER_NETLINK_ACCT help This option allows you to use the extended accounting through