dio: don't zero out the pages array inside struct dio

[safe/jmp/linux-2.6] / drivers / isdn / Kconfig

diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index d42fe89..022a194 100644 (file)
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -2,12 +2,10 @@
 # ISDN device configuration
 #
 
-menu "ISDN subsystem"
-       depends on !S390
-
-config ISDN
-       tristate "ISDN support"
+menuconfig ISDN
+       bool "ISDN support"
        depends on NET
+       depends on !S390
        ---help---
          ISDN ("Integrated Services Digital Networks", called RNIS in France)
          is a special type of fully digital telephone service; it's mostly
@@ -21,14 +19,12 @@ config ISDN
 
          Select this option if you want your kernel to support ISDN.
 
+if ISDN
 
-menu "Old ISDN4Linux"
-       depends on NET && ISDN
-
-config ISDN_I4L
-       tristate "Old ISDN4Linux (obsolete)"
+menuconfig ISDN_I4L
+       tristate "Old ISDN4Linux (deprecated)"
        ---help---
-         This driver allows you to use an ISDN-card for networking
+         This driver allows you to use an ISDN adapter for networking
          connections and as dialin/out device.  The isdn-tty's have a built
          in AT-compatible modem emulator.  Network devices support autodial,
          channel-bundling, callback and caller-authentication without having
@@ -39,30 +35,30 @@ config ISDN_I4L
 
          ISDN support in the linux kernel is moving towards a new API,
          called CAPI (Common ISDN Application Programming Interface).
-         Therefore the old ISDN4Linux layer is becoming obsolete. It is 
-         still usable, though, if you select this option.
+         Therefore the old ISDN4Linux layer will eventually become obsolete.
+         It is still available, though, for use with adapters that are not
+         supported by the new CAPI subsystem yet.
 
-if ISDN_I4L
-source "drivers/isdn/i4l/Kconfig"
-endif
+source "drivers/isdn/mISDN/Kconfig"
 
-endmenu
-
-comment "CAPI subsystem"
-       depends on NET && ISDN
+source "drivers/isdn/i4l/Kconfig"
 
-config ISDN_CAPI
-       tristate "CAPI2.0 support"
-       depends on ISDN
+menuconfig ISDN_CAPI
+       tristate "CAPI 2.0 subsystem"
        help
          This provides the CAPI (Common ISDN Application Programming
          Interface, a standard making it easy for programs to access ISDN
          hardware, see <http://www.capi.org/>.  This is needed for AVM's set
          of active ISDN controllers like B1, T1, M1.
 
+if ISDN_CAPI
+
 source "drivers/isdn/capi/Kconfig"
 
 source "drivers/isdn/hardware/Kconfig"
 
-endmenu
+endif # ISDN_CAPI
+
+source "drivers/isdn/gigaset/Kconfig"
 
+endif # ISDN