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>
This commit is contained in:
Родитель
48e2f183cb
Коммит
e5f8d9ac46
|
@ -7,15 +7,14 @@ menuconfig ISDN
|
||||||
depends on NET
|
depends on NET
|
||||||
depends on !S390
|
depends on !S390
|
||||||
---help---
|
---help---
|
||||||
ISDN ("Integrated Services Digital Networks", called RNIS in France)
|
ISDN ("Integrated Services Digital Network", called RNIS in France)
|
||||||
is a special type of fully digital telephone service; it's mostly
|
is a fully digital telephone service that can be used for voice and
|
||||||
used to connect to your Internet service provider (with SLIP or
|
data connections. If your computer is equipped with an ISDN
|
||||||
PPP). The main advantage is that the speed is higher than ordinary
|
adapter you can use it to connect to your Internet service provider
|
||||||
modem/telephone connections, and that you can have voice
|
(with SLIP or PPP) faster than via a conventional telephone modem
|
||||||
conversations while downloading stuff. It only works if your
|
(though still much slower than with DSL) or to make and accept
|
||||||
computer is equipped with an ISDN card and both you and your service
|
voice calls (eg. turning your PC into a software answering machine
|
||||||
provider purchased an ISDN line from the phone company. For
|
or PABX).
|
||||||
details, read <http://www.alumni.caltech.edu/~dank/isdn/> on the WWW.
|
|
||||||
|
|
||||||
Select this option if you want your kernel to support ISDN.
|
Select this option if you want your kernel to support ISDN.
|
||||||
|
|
||||||
|
@ -39,17 +38,22 @@ menuconfig ISDN_I4L
|
||||||
It is still available, though, for use with adapters that are not
|
It is still available, though, for use with adapters that are not
|
||||||
supported by the new CAPI subsystem yet.
|
supported by the new CAPI subsystem yet.
|
||||||
|
|
||||||
source "drivers/isdn/mISDN/Kconfig"
|
|
||||||
|
|
||||||
source "drivers/isdn/i4l/Kconfig"
|
source "drivers/isdn/i4l/Kconfig"
|
||||||
|
|
||||||
menuconfig ISDN_CAPI
|
menuconfig ISDN_CAPI
|
||||||
tristate "CAPI 2.0 subsystem"
|
tristate "CAPI 2.0 subsystem"
|
||||||
help
|
help
|
||||||
This provides the CAPI (Common ISDN Application Programming
|
This provides CAPI (the Common ISDN Application Programming
|
||||||
Interface, a standard making it easy for programs to access ISDN
|
Interface) Version 2.0, a standard making it easy for programs to
|
||||||
hardware, see <http://www.capi.org/>. This is needed for AVM's set
|
access ISDN hardware in a device independent way. (For details see
|
||||||
of active ISDN controllers like B1, T1, M1.
|
<http://www.capi.org/>.) CAPI supports making and accepting voice
|
||||||
|
and data connections, controlling call options and protocols,
|
||||||
|
as well as ISDN supplementary services like call forwarding or
|
||||||
|
three-party conferences (if supported by the specific hardware
|
||||||
|
driver).
|
||||||
|
|
||||||
|
Select this option and the appropriate hardware driver below if
|
||||||
|
you have an ISDN adapter supported by the CAPI subsystem.
|
||||||
|
|
||||||
if ISDN_CAPI
|
if ISDN_CAPI
|
||||||
|
|
||||||
|
@ -61,4 +65,13 @@ endif # ISDN_CAPI
|
||||||
|
|
||||||
source "drivers/isdn/gigaset/Kconfig"
|
source "drivers/isdn/gigaset/Kconfig"
|
||||||
|
|
||||||
|
source "drivers/isdn/hysdn/Kconfig"
|
||||||
|
|
||||||
|
source "drivers/isdn/mISDN/Kconfig"
|
||||||
|
|
||||||
|
config ISDN_HDLC
|
||||||
|
tristate
|
||||||
|
select CRC_CCITT
|
||||||
|
select BITREVERSE
|
||||||
|
|
||||||
endif # ISDN
|
endif # ISDN
|
||||||
|
|
|
@ -134,14 +134,7 @@ source "drivers/isdn/sc/Kconfig"
|
||||||
|
|
||||||
source "drivers/isdn/act2000/Kconfig"
|
source "drivers/isdn/act2000/Kconfig"
|
||||||
|
|
||||||
source "drivers/isdn/hysdn/Kconfig"
|
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
# end ISDN_I4L
|
# end ISDN_I4L
|
||||||
endif
|
endif
|
||||||
|
|
||||||
config ISDN_HDLC
|
|
||||||
tristate
|
|
||||||
select CRC_CCITT
|
|
||||||
select BITREVERSE
|
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче