Merge branch 'for-linus' of git://neil.brown.name/md

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

diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig
index 05ab18e62deeb1f0003ba0482e4a806ed1ec4618..3b30d1130b615fa75db3d2f4a5f8d308cff21164 100644 (file)
--- a/net/tipc/Kconfig
+++ b/net/tipc/Kconfig
@@ -2,24 +2,28 @@
 # TIPC configuration
 #
 
 # TIPC configuration
 #
 

-menu "TIPC Configuration (EXPERIMENTAL)"
-       depends on INET && EXPERIMENTAL
-
-config TIPC
+menuconfig TIPC

        tristate "The TIPC Protocol (EXPERIMENTAL)"
        tristate "The TIPC Protocol (EXPERIMENTAL)"

+       depends on INET && EXPERIMENTAL

        ---help---
        ---help---

-         TBD.
+         The Transparent Inter Process Communication (TIPC) protocol is
+         specially designed for intra cluster communication. This protocol
+         originates from Ericsson where it has been used in carrier grade
+         cluster applications for many years.
+       
+         For more information about TIPC, see http://tipc.sourceforge.net.

 
          This protocol support is also available as a module ( = code which
          can be inserted in and removed from the running kernel whenever you
          want). The module will be called tipc. If you want to compile it
 
          This protocol support is also available as a module ( = code which
          can be inserted in and removed from the running kernel whenever you
          want). The module will be called tipc. If you want to compile it

-         as a module, say M here and read <file:Documentation/modules.txt>.
+         as a module, say M here and read <file:Documentation/kbuild/modules.txt>.

 
          If in doubt, say N.
 
 
          If in doubt, say N.
 

+if TIPC
+

 config TIPC_ADVANCED
        bool "TIPC: Advanced configuration"
 config TIPC_ADVANCED
        bool "TIPC: Advanced configuration"

-       depends on TIPC

        default n
        help
          Saying Y here will open some advanced configuration
        default n
        help
          Saying Y here will open some advanced configuration


@@ -28,7 +32,7 @@ config TIPC_ADVANCED
 
 config TIPC_ZONES
        int "Maximum number of zones in network"
 
 config TIPC_ZONES
        int "Maximum number of zones in network"

-       depends on TIPC && TIPC_ADVANCED
+       depends on TIPC_ADVANCED

        default "3"
        help
         Max number of zones inside TIPC network. Max supported value 
        default "3"
        help
         Max number of zones inside TIPC network. Max supported value 


@@ -39,7 +43,7 @@ config TIPC_ZONES
 
 config TIPC_CLUSTERS
        int "Maximum number of clusters in a zone"
 
 config TIPC_CLUSTERS
        int "Maximum number of clusters in a zone"

-       depends on TIPC && TIPC_ADVANCED
+       depends on TIPC_ADVANCED

        default "1"
        help
           ***Only 1 (one cluster in a zone) is supported by current code.
        default "1"
        help
           ***Only 1 (one cluster in a zone) is supported by current code.


@@ -54,7 +58,7 @@ config TIPC_CLUSTERS
 
 config TIPC_NODES
        int "Maximum number of nodes in cluster"
 
 config TIPC_NODES
        int "Maximum number of nodes in cluster"

-       depends on TIPC && TIPC_ADVANCED
+       depends on TIPC_ADVANCED

        default "255"
        help
          Maximum number of nodes inside a TIPC cluster. Maximum 
        default "255"
        help
          Maximum number of nodes inside a TIPC cluster. Maximum 


@@ -65,7 +69,7 @@ config TIPC_NODES
 
 config TIPC_SLAVE_NODES
        int "Maximum number of slave nodes in cluster"
 
 config TIPC_SLAVE_NODES
        int "Maximum number of slave nodes in cluster"

-       depends on TIPC && TIPC_ADVANCED
+       depends on TIPC_ADVANCED

        default "0"
        help
           ***This capability is not supported by current code.***
        default "0"
        help
           ***This capability is not supported by current code.***


@@ -78,7 +82,7 @@ config TIPC_SLAVE_NODES
 
 config TIPC_PORTS
        int "Maximum number of ports in a node"
 
 config TIPC_PORTS
        int "Maximum number of ports in a node"

-       depends on TIPC && TIPC_ADVANCED
+       depends on TIPC_ADVANCED

        default "8191"
        help
          Maximum number of ports within a node. Maximum 
        default "8191"
        help
          Maximum number of ports within a node. Maximum 


@@ -89,7 +93,7 @@ config TIPC_PORTS
 
 config TIPC_LOG
        int "Size of log buffer"
 
 config TIPC_LOG
        int "Size of log buffer"

-       depends on TIPC && TIPC_ADVANCED
+       depends on TIPC_ADVANCED

        default 0
        help
          Size (in bytes) of TIPC's internal log buffer, which records the
        default 0
        help
          Size (in bytes) of TIPC's internal log buffer, which records the


@@ -101,7 +105,6 @@ config TIPC_LOG
 
 config TIPC_DEBUG
        bool "Enable debugging support"
 
 config TIPC_DEBUG
        bool "Enable debugging support"

-       depends on TIPC

        default n
        help
          This will enable debugging of TIPC.
        default n
        help
          This will enable debugging of TIPC.


@@ -109,4 +112,4 @@ config TIPC_DEBUG
          Only say Y here if you are having trouble with TIPC.  It will
          enable the display of detailed information about what is going on.
 
          Only say Y here if you are having trouble with TIPC.  It will
          enable the display of detailed information about what is going on.
 

-endmenu
+endif # TIPC