diff --git a/[refs] b/[refs] index d742a1f28716..fb809be84911 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab4f21e6fb1c09b13c4c3cb8357babe8223471bd +refs/heads/master: f39a9410ed0503278fd5edc559fa019051413039 diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig index 899e78051d8b..f70b4145ffc7 100644 --- a/trunk/net/netfilter/Kconfig +++ b/trunk/net/netfilter/Kconfig @@ -318,7 +318,6 @@ config NETFILTER_XT_TARGET_CLASSIFY config NETFILTER_XT_TARGET_CONNMARK tristate '"CONNMARK" target support' - depends on IP_NF_MANGLE || IP6_NF_MANGLE depends on NF_CONNTRACK depends on NETFILTER_ADVANCED select NF_CONNTRACK_MARK