From 141f564acb097c4bb168b2df57243a3150038964 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@parallels.com>
Date: Fri, 9 Dec 2011 23:33:43 +0000
Subject: [PATCH] --- yaml --- r: 278553 b: refs/heads/master c:
 b872a2371ffd13e6d83423ef621a707df4c158ac h: refs/heads/master i:   278551:
 3f7aaa552842c3f39035be95caf1edf3c5c745eb v: v3

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

diff --git a/[refs] b/[refs]
index 3d5d4bce381d..7351c567cc1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 507dd7961eed950ef958a9a9536de987c52e81cd
+refs/heads/master: b872a2371ffd13e6d83423ef621a707df4c158ac
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
index a51e33e64552..1a8f93bd2d4f 100644
--- a/trunk/net/ipv4/Kconfig
+++ b/trunk/net/ipv4/Kconfig
@@ -411,7 +411,7 @@ config INET_TCP_DIAG
 
 config INET_UDP_DIAG
 	depends on INET_DIAG
-	def_tristate INET_DIAG
+	def_tristate INET_DIAG && IPV6
 
 menuconfig TCP_CONG_ADVANCED
 	bool "TCP: advanced congestion control"