aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/Kconfig
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2010-02-22 06:09:38 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-22 18:45:53 -0500
commite5f8d9ac46e0291594abaa76bf467a08367bcccf (patch)
tree65fa3eef81a3c330018dca05e483c7723016bbc5 /drivers/isdn/Kconfig
parent48e2f183cb1709600012265a2e723f45a350d5fe (diff)
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>
Diffstat (limited to 'drivers/isdn/Kconfig')
-rw-r--r--drivers/isdn/Kconfig43
1 files changed, 28 insertions, 15 deletions
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index 022a19452953..4fb601670de3 100644
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -7,15 +7,14 @@ menuconfig ISDN
7 depends on NET 7 depends on NET
8 depends on !S390 8 depends on !S390
9 ---help--- 9 ---help---
10 ISDN ("Integrated Services Digital Networks", called RNIS in France) 10 ISDN ("Integrated Services Digital Network", called RNIS in France)
11 is a special type of fully digital telephone service; it's mostly 11 is a fully digital telephone service that can be used for voice and
12 used to connect to your Internet service provider (with SLIP or 12 data connections. If your computer is equipped with an ISDN
13 PPP). The main advantage is that the speed is higher than ordinary 13 adapter you can use it to connect to your Internet service provider
14 modem/telephone connections, and that you can have voice 14 (with SLIP or PPP) faster than via a conventional telephone modem
15 conversations while downloading stuff. It only works if your 15 (though still much slower than with DSL) or to make and accept
16 computer is equipped with an ISDN card and both you and your service 16 voice calls (eg. turning your PC into a software answering machine
17 provider purchased an ISDN line from the phone company. For 17 or PABX).
18 details, read <http://www.alumni.caltech.edu/~dank/isdn/> on the WWW.
19 18
20 Select this option if you want your kernel to support ISDN. 19 Select this option if you want your kernel to support ISDN.
21 20
@@ -39,17 +38,22 @@ menuconfig ISDN_I4L
39 It is still available, though, for use with adapters that are not 38 It is still available, though, for use with adapters that are not
40 supported by the new CAPI subsystem yet. 39 supported by the new CAPI subsystem yet.
41 40
42source "drivers/isdn/mISDN/Kconfig"
43
44source "drivers/isdn/i4l/Kconfig" 41source "drivers/isdn/i4l/Kconfig"
45 42
46menuconfig ISDN_CAPI 43menuconfig ISDN_CAPI
47 tristate "CAPI 2.0 subsystem" 44 tristate "CAPI 2.0 subsystem"
48 help 45 help
49 This provides the CAPI (Common ISDN Application Programming 46 This provides CAPI (the Common ISDN Application Programming
50 Interface, a standard making it easy for programs to access ISDN 47 Interface) Version 2.0, a standard making it easy for programs to
51 hardware, see <http://www.capi.org/>. This is needed for AVM's set 48 access ISDN hardware in a device independent way. (For details see
52 of active ISDN controllers like B1, T1, M1. 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).
54
55 Select this option and the appropriate hardware driver below if
56 you have an ISDN adapter supported by the CAPI subsystem.
53 57
54if ISDN_CAPI 58if ISDN_CAPI
55 59
@@ -61,4 +65,13 @@ endif # ISDN_CAPI
61 65
62source "drivers/isdn/gigaset/Kconfig" 66source "drivers/isdn/gigaset/Kconfig"
63 67
68source "drivers/isdn/hysdn/Kconfig"
69
70source "drivers/isdn/mISDN/Kconfig"
71
72config ISDN_HDLC
73 tristate
74 select CRC_CCITT
75 select BITREVERSE
76
64endif # ISDN 77endif # ISDN