Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for...

[linux-2.6-omap-h63xx.git] / net / dccp / Kconfig

diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index 24a6981e209a542ba425704965aa6b538bbfda7c..859e3359fcda70c166fcc1a5242a468814c5bbf4 100644 (file)
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -26,7 +26,7 @@ config INET_DCCP_DIAG
 
 config IP_DCCP_ACKVEC
        depends on IP_DCCP
-       def_bool N
+       bool
 
 source "net/dccp/ccids/Kconfig"
 
@@ -40,15 +40,6 @@ config IP_DCCP_DEBUG
 
          Just say N.
 
-config IP_DCCP_UNLOAD_HACK
-       depends on IP_DCCP=m && IP_DCCP_CCID3=m
-       bool "DCCP control sock unload hack"
-       ---help---
-         Enable this to be able to unload the dccp module when the it
-         has only one refcount held, the control sock one. Just execute
-         "rmmod dccp_ccid3 dccp"
-
-         Just say N.
 endmenu
 
 endmenu