From 35aac055d1393207946ab112217ad19ff613e210 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Mon, 8 Feb 2010 10:12:44 +0000 Subject: [PATCH] --- yaml --- r: 184247 b: refs/heads/master c: 79e95f4717767e9ddc4dbec5d778f0c9970eed34 h: refs/heads/master i: 184245: f73ddcd2de2501cc68e6e720cee9a613146042d7 184243: f2b4da3647912dcd78a3a0490d5dfedf9ad711ad 184239: a688430c41f37c3e451da5a4c5c5ce1037820936 v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 10 ++++++++++ trunk/drivers/isdn/capi/Kconfig | 13 +++++++------ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5662b0a6f4c1..40608056da6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6af0437941c92179eeb51579f19423eacc5516c +refs/heads/master: 79e95f4717767e9ddc4dbec5d778f0c9970eed34 diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 2f93ac06c414..721a2aa80a1d 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/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 + +---------------------------- + +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 diff --git a/trunk/drivers/isdn/capi/Kconfig b/trunk/drivers/isdn/capi/Kconfig index b2a04755c96a..d607d465786e 100644 --- a/trunk/drivers/isdn/capi/Kconfig +++ b/trunk/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"