From 1d9a6ec3f283eee8c6a5439c54c0aff8cdec929e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Oct 2008 11:35:20 +0200 Subject: [PATCH] --- yaml --- r: 112139 b: refs/heads/master c: f39a9410ed0503278fd5edc559fa019051413039 h: refs/heads/master i: 112137: f2abe046ccad7ad4d47360002dc4695969e6d452 112135: afb22d9b3310e7398ebf6faad425ffad95883287 v: v3 --- [refs] | 2 +- trunk/net/netfilter/Kconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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