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.