Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / net / dccp / Kconfig

diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index ff5b5459b97a7aee85603b57ead1e5b2b174799d..7e096ba8454fcef7e6e0888f08fdd4c415198674 100644 (file)
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -19,11 +19,27 @@ config IP_DCCP
 
          If in doubt, say N.
 
-config IP_DCCP_DIAG
-       depends on IP_DCCP && IP_TCPDIAG
-       def_tristate y if (IP_DCCP = y && IP_TCPDIAG = y)
+config INET_DCCP_DIAG
+       depends on IP_DCCP && INET_DIAG
+       def_tristate y if (IP_DCCP = y && INET_DIAG = y)
        def_tristate m
 
+config IP_DCCP_ACKVEC
+       depends on IP_DCCP
+       def_bool N
+
 source "net/dccp/ccids/Kconfig"
 
+menu "DCCP Kernel Hacking"
+       depends on IP_DCCP && DEBUG_KERNEL=y
+
+config IP_DCCP_DEBUG
+       bool "DCCP debug messages"
+       ---help---
+         Only use this if you're hacking DCCP.
+
+         Just say N.
+
+endmenu
+
 endmenu