Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / drivers / isdn / capi / Kconfig

diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index 8b6c9a431ffa6d1ea0f6ccdec96000bab8d465c9..e1afd60924fb00f05ac7706e608208182a7b287b 100644 (file)
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -2,16 +2,26 @@
 # Config.in for the CAPI subsystem
 #
 config ISDN_DRV_AVMB1_VERBOSE_REASON
-       bool "Verbose reason code reporting (kernel size +=7K)"
-       depends on ISDN_CAPI
+       bool "Verbose reason code reporting"
+       default y
        help
-         If you say Y here, the AVM B1 driver will give verbose reasons for
+         If you say Y here, the CAPI drivers will give verbose reasons for
          disconnecting. This will increase the size of the kernel by 7 KB. If
          unsure, say Y.
 
+config CAPI_TRACE
+       bool "CAPI trace support"
+       default y
+       help
+         If you say Y here, the kernelcapi driver can make verbose traces
+         of CAPI messages. This feature can be enabled/disabled via IOCTL for
+         every controller (default disabled).
+         This will increase the size of the kernelcapi module by 20 KB.
+         If unsure, say Y.
+
 config ISDN_CAPI_MIDDLEWARE
        bool "CAPI2.0 Middleware support (EXPERIMENTAL)"
-       depends on ISDN_CAPI && EXPERIMENTAL
+       depends on EXPERIMENTAL
        help
          This option will enhance the capabilities of the /dev/capi20
          interface.  It will provide a means of moving a data connection,
@@ -21,7 +31,6 @@ config ISDN_CAPI_MIDDLEWARE
 
 config ISDN_CAPI_CAPI20
        tristate "CAPI2.0 /dev/capi support"
-       depends on ISDN_CAPI
        help
          This option will provide the CAPI 2.0 interface to userspace
          applications via /dev/capi20. Applications should use the
@@ -44,7 +53,7 @@ config ISDN_CAPI_CAPIFS
 
 config ISDN_CAPI_CAPIDRV
        tristate "CAPI2.0 capidrv interface support"
-       depends on ISDN_CAPI && ISDN_I4L
+       depends on ISDN_I4L
        help
          This option provides the glue code to hook up CAPI driven cards to
          the legacy isdn4linux link layer.  If you have a card which is