Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6] / net / sctp / Kconfig

diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig
index 8210f549c4929914f29fe07f4d81809bbdb41a24..58b3e882a187a1ff3205efa5de37fd9d15c758a8 100644 (file)
--- a/net/sctp/Kconfig
+++ b/net/sctp/Kconfig
@@ -6,10 +6,11 @@ menuconfig IP_SCTP
        tristate "The SCTP Protocol (EXPERIMENTAL)"
        depends on INET && EXPERIMENTAL
        depends on IPV6 || IPV6=n
        tristate "The SCTP Protocol (EXPERIMENTAL)"
        depends on INET && EXPERIMENTAL
        depends on IPV6 || IPV6=n

-       select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
-       select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
-       select CRYPTO_SHA1 if SCTP_HMAC_SHA1
+       select CRYPTO
+       select CRYPTO_HMAC
+       select CRYPTO_SHA1

        select CRYPTO_MD5 if SCTP_HMAC_MD5
        select CRYPTO_MD5 if SCTP_HMAC_MD5

+       select LIBCRC32C

        ---help---
          Stream Control Transmission Protocol
 
        ---help---
          Stream Control Transmission Protocol
 


@@ -46,11 +47,11 @@ config SCTP_DBG_MSG
 
 config SCTP_DBG_OBJCNT
        bool "SCTP: Debug object counts"
 
 config SCTP_DBG_OBJCNT
        bool "SCTP: Debug object counts"

+       depends on PROC_FS

        help
          If you say Y, this will enable debugging support for counting the 
          type of objects that are currently allocated.  This is useful for 
        help
          If you say Y, this will enable debugging support for counting the 
          type of objects that are currently allocated.  This is useful for 

-         identifying memory leaks.   If the /proc filesystem is enabled this 
-         debug information can be viewed by 
+         identifying memory leaks. This debug information can be viewed by

          'cat /proc/net/sctp/sctp_dbg_objcnt'
 
          If unsure, say N
          'cat /proc/net/sctp/sctp_dbg_objcnt'
 
          If unsure, say N