Merge branch 'ebt_config_compat_v4' of git://git.breakpoint.cc/fw/nf-next-2.6

[net-next-2.6.git] / drivers / isdn / capi / Kconfig

diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index b2a04755c96a4bfab6c323dcee376d38a1b9fa10..a168e8a891beac1b7975a169b2c7edec58623a4c 100644 (file)
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -17,8 +17,7 @@ config CAPI_TRACE
          If unsure, say Y.
 
 config ISDN_CAPI_MIDDLEWARE
-       bool "CAPI2.0 Middleware support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "CAPI2.0 Middleware support"
        help
          This option will enhance the capabilities of the /dev/capi20
          interface.  It will provide a means of moving a data connection,
@@ -35,18 +34,19 @@ config ISDN_CAPI_CAPI20
          Y/M here.
 
 config ISDN_CAPI_CAPIFS_BOOL
-       bool "CAPI2.0 filesystem support"
+       bool "CAPI2.0 filesystem support (DEPRECATED)"
        depends on ISDN_CAPI_MIDDLEWARE && ISDN_CAPI_CAPI20
+       help
+         This option provides a special file system, similar to /dev/pts with
+         device nodes for the special ttys established by using the
+         middleware extension above.
+         You no longer need this, udev fully replaces it. This feature is
+         scheduled for removal.
 
 config ISDN_CAPI_CAPIFS
        tristate
        depends on ISDN_CAPI_CAPIFS_BOOL
        default ISDN_CAPI_CAPI20
-       help
-         This option provides a special file system, similar to /dev/pts with
-         device nodes for the special ttys established by using the
-         middleware extension above. If you want to use pppd with
-         pppdcapiplugin to dial up to your ISP, say Y here.
 
 config ISDN_CAPI_CAPIDRV
        tristate "CAPI2.0 capidrv interface support"