Commit e5f8d9ac46e0291594abaa76bf467a08367bcccf
Committed by
David S. Miller
David S. Miller
1 parent
48e2f183cb
Exists in
master
and in
4 other branches
isdn: fix a few Kconfig imperfections
1. Rewrite the outdated help texts for config options ISDN and ISDN_CAPI. 2. The MISDN config option appeared between ISDN_I4L and the I4L hardware driver options; move it to a less irritating place. 3. HYSDN is not in fact an I4L driver, and needn't depend on ISDN_I4L, so move it from the I4L section to the general section. 4. ISDN_HDLC is now also used by drivers outside I4L. Move it from the I4L section to the general section, too. Signed-off-by: Tilman Schmidt <tilman@imap.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 2 changed files with 28 additions and 22 deletions Side-by-side Diff
drivers/isdn/Kconfig
| ... | ... | @@ -7,15 +7,14 @@ |
| 7 | 7 | depends on NET |
| 8 | 8 | depends on !S390 |
| 9 | 9 | ---help--- |
| 10 | - ISDN ("Integrated Services Digital Networks", called RNIS in France) | |
| 11 | - is a special type of fully digital telephone service; it's mostly | |
| 12 | - used to connect to your Internet service provider (with SLIP or | |
| 13 | - PPP). The main advantage is that the speed is higher than ordinary | |
| 14 | - modem/telephone connections, and that you can have voice | |
| 15 | - conversations while downloading stuff. It only works if your | |
| 16 | - computer is equipped with an ISDN card and both you and your service | |
| 17 | - provider purchased an ISDN line from the phone company. For | |
| 18 | - details, read <http://www.alumni.caltech.edu/~dank/isdn/> on the WWW. | |
| 10 | + ISDN ("Integrated Services Digital Network", called RNIS in France) | |
| 11 | + is a fully digital telephone service that can be used for voice and | |
| 12 | + data connections. If your computer is equipped with an ISDN | |
| 13 | + adapter you can use it to connect to your Internet service provider | |
| 14 | + (with SLIP or PPP) faster than via a conventional telephone modem | |
| 15 | + (though still much slower than with DSL) or to make and accept | |
| 16 | + voice calls (eg. turning your PC into a software answering machine | |
| 17 | + or PABX). | |
| 19 | 18 | |
| 20 | 19 | Select this option if you want your kernel to support ISDN. |
| 21 | 20 | |
| 22 | 21 | |
| 23 | 22 | |
| ... | ... | @@ -39,18 +38,23 @@ |
| 39 | 38 | It is still available, though, for use with adapters that are not |
| 40 | 39 | supported by the new CAPI subsystem yet. |
| 41 | 40 | |
| 42 | -source "drivers/isdn/mISDN/Kconfig" | |
| 43 | - | |
| 44 | 41 | source "drivers/isdn/i4l/Kconfig" |
| 45 | 42 | |
| 46 | 43 | menuconfig ISDN_CAPI |
| 47 | 44 | tristate "CAPI 2.0 subsystem" |
| 48 | 45 | help |
| 49 | - This provides the CAPI (Common ISDN Application Programming | |
| 50 | - Interface, a standard making it easy for programs to access ISDN | |
| 51 | - hardware, see <http://www.capi.org/>. This is needed for AVM's set | |
| 52 | - of active ISDN controllers like B1, T1, M1. | |
| 46 | + This provides CAPI (the Common ISDN Application Programming | |
| 47 | + Interface) Version 2.0, a standard making it easy for programs to | |
| 48 | + access ISDN hardware in a device independent way. (For details see | |
| 49 | + <http://www.capi.org/>.) CAPI supports making and accepting voice | |
| 50 | + and data connections, controlling call options and protocols, | |
| 51 | + as well as ISDN supplementary services like call forwarding or | |
| 52 | + three-party conferences (if supported by the specific hardware | |
| 53 | + driver). | |
| 53 | 54 | |
| 55 | + Select this option and the appropriate hardware driver below if | |
| 56 | + you have an ISDN adapter supported by the CAPI subsystem. | |
| 57 | + | |
| 54 | 58 | if ISDN_CAPI |
| 55 | 59 | |
| 56 | 60 | source "drivers/isdn/capi/Kconfig" |
| ... | ... | @@ -60,6 +64,15 @@ |
| 60 | 64 | endif # ISDN_CAPI |
| 61 | 65 | |
| 62 | 66 | source "drivers/isdn/gigaset/Kconfig" |
| 67 | + | |
| 68 | +source "drivers/isdn/hysdn/Kconfig" | |
| 69 | + | |
| 70 | +source "drivers/isdn/mISDN/Kconfig" | |
| 71 | + | |
| 72 | +config ISDN_HDLC | |
| 73 | + tristate | |
| 74 | + select CRC_CCITT | |
| 75 | + select BITREVERSE | |
| 63 | 76 | |
| 64 | 77 | endif # ISDN |
drivers/isdn/i4l/Kconfig