2 files changed, 17 insertions, 6 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2f93ac06c414..721a2aa80a1d 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -521,3 +521,13 @@ Why:	Duplicate functionality with the gspca_zc3xx driver, zc0301 only
         sensors) wich are also supported by the gspca_zc3xx driver
         (which supports 53 USB-ID's in total)
 Who:    Hans de Goede <hdegoede@redhat.com>
+
+----------------------------
+
+What:   capifs
+When:   February 2011
+Files:  drivers/isdn/capi/capifs.*
+Why:    udev fully replaces this special file system that only contains CAPI
+        NCCI TTY device nodes. User space (pppdcapiplugin) works without
+        noticing the difference.
+Who:    Jan Kiszka <jan.kiszka@web.de>
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index b2a04755c96a..d607d465786e 100644
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -35,18 +35,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"