Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tilman Schmidt and committed by
David S. Miller
e5f8d9ac 48e2f183

+28 -22
+28 -15
drivers/isdn/Kconfig
··· 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 ··· 38 39 It is still available, though, for use with adapters that are not 39 40 supported by the new CAPI subsystem yet. 40 41 41 - source "drivers/isdn/mISDN/Kconfig" 42 - 43 42 source "drivers/isdn/i4l/Kconfig" 44 43 45 44 menuconfig ISDN_CAPI 46 45 tristate "CAPI 2.0 subsystem" 47 46 help 48 - This provides the CAPI (Common ISDN Application Programming 49 - Interface, a standard making it easy for programs to access ISDN 50 - hardware, see <http://www.capi.org/>. This is needed for AVM's set 51 - of active ISDN controllers like B1, T1, M1. 47 + This provides CAPI (the Common ISDN Application Programming 48 + Interface) Version 2.0, a standard making it easy for programs to 49 + access ISDN hardware in a device independent way. (For details see 50 + <http://www.capi.org/>.) CAPI supports making and accepting voice 51 + and data connections, controlling call options and protocols, 52 + as well as ISDN supplementary services like call forwarding or 53 + three-party conferences (if supported by the specific hardware 54 + driver). 55 + 56 + Select this option and the appropriate hardware driver below if 57 + you have an ISDN adapter supported by the CAPI subsystem. 52 58 53 59 if ISDN_CAPI 54 60 ··· 64 60 endif # ISDN_CAPI 65 61 66 62 source "drivers/isdn/gigaset/Kconfig" 63 + 64 + source "drivers/isdn/hysdn/Kconfig" 65 + 66 + source "drivers/isdn/mISDN/Kconfig" 67 + 68 + config ISDN_HDLC 69 + tristate 70 + select CRC_CCITT 71 + select BITREVERSE 67 72 68 73 endif # ISDN
-7
drivers/isdn/i4l/Kconfig
··· 134 134 135 135 source "drivers/isdn/act2000/Kconfig" 136 136 137 - source "drivers/isdn/hysdn/Kconfig" 138 - 139 137 endmenu 140 138 # end ISDN_I4L 141 139 endif 142 - 143 - config ISDN_HDLC 144 - tristate 145 - select CRC_CCITT 146 - select BITREVERSE 147 140