Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / tipc / Kconfig

diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig
index b74f78d0c0338a467bccc1914a51e977b6f8b7b5..0436927369f3a5685346681f4a312a9fbe36130c 100644 (file)
--- a/net/tipc/Kconfig
+++ b/net/tipc/Kconfig
@@ -29,28 +29,6 @@ config TIPC_ADVANCED
          Saying Y here will open some advanced configuration for TIPC.
          Most users do not need to bother; if unsure, just say N.
 
-config TIPC_ZONES
-       int "Maximum number of zones in a network"
-       depends on TIPC_ADVANCED
-       range 1 255
-       default "3"
-       help
-         Specifies how many zones can be supported in a TIPC network.
-         Can range from 1 to 255 zones; default is 3.
-
-         Setting this to a smaller value saves some memory;
-         setting it to a higher value allows for more zones.
-
-config TIPC_CLUSTERS
-       int "Maximum number of clusters in a zone"
-       depends on TIPC_ADVANCED
-       range 1 1
-       default "1"
-       help
-         Specifies how many clusters can be supported in a TIPC zone.
-
-         *** Currently TIPC only supports a single cluster per zone. ***
-
 config TIPC_NODES
        int "Maximum number of nodes in a cluster"
        depends on TIPC_ADVANCED
@@ -72,7 +50,7 @@ config TIPC_PORTS
          Specifies how many ports can be supported by a node.
          Can range from 127 to 65535 ports; default is 8191.
 
-         Setting this to a smaller value saves some memory, 
+         Setting this to a smaller value saves some memory,
          setting it to higher allows for more ports.
 
 config TIPC_LOG
@@ -89,12 +67,15 @@ config TIPC_LOG
          managed remotely via TIPC.
 
 config TIPC_DEBUG
-       bool "Enable debug messages"
+       bool "Enable debugging support"
        default n
        help
-         This enables debugging of TIPC.
+         Saying Y here enables TIPC debugging capabilities used by developers.
+         Most users do not need to bother; if unsure, just say N.
 
-         Only say Y here if you are having trouble with TIPC.  It will
-         enable the display of detailed information about what is going on.
+         Enabling debugging support causes TIPC to display data about its
+         internal state when certain abnormal conditions occur. It also
+         makes it easy for developers to capture additional information of
+         interest using the dbg() or msg_dbg() macros.
 
 endif # TIPC