From d681d759d2209fcb057bfb719ac44cfc90653a2e Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 30 Jan 2007 21:36:09 -0800
Subject: [PATCH] --- yaml --- r: 46015 b: refs/heads/master c:
 2e5530236645a042e1481aa19879b819c3e8f5c9 h: refs/heads/master i:   46013:
 1d87e7927d99ba3a07c3e70341df1d147644be05   46011:
 81bc31318de2551333b1fd266d8b53a1e2a3a214   46007:
 259453d8609b0d432cc84be5a5dadfa4c43ddb04   45999:
 9e06b98f71663941de871bc15e8abfb6bc413319   45983:
 ad79db6dfe640cc3f18ba491b489904511d44a76   45951:
 5a3763c478b9082b6eef355f2dd13fc59a6c8443 v: v3

---
 [refs]                      | 2 +-
 trunk/net/netfilter/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 38349b1946a5..e49d391406bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e533ca16f31f9e5abfaf5d8c7dbe7095f01474b6
+refs/heads/master: 2e5530236645a042e1481aa19879b819c3e8f5c9
diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig
index cd10e44db015..2a2bcb303bfa 100644
--- a/trunk/net/netfilter/Kconfig
+++ b/trunk/net/netfilter/Kconfig
@@ -628,7 +628,7 @@ config NETFILTER_XT_MATCH_TCPMSS
 
 config NETFILTER_XT_MATCH_HASHLIMIT
 	tristate '"hashlimit" match support'
-	depends on NETFILTER_XTABLES
+	depends on NETFILTER_XTABLES && (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
 	help
 	  This option adds a `hashlimit' match.