KVM: VMX: Use INTR_TYPE_NMI_INTR instead of magic value

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

diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index a3c9a03..3d113c6 100644 (file)
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menuconfig ISDN
-       tristate "ISDN support"
+       bool "ISDN support"
        depends on NET
        depends on !S390
        ---help---
@@ -21,9 +21,9 @@ menuconfig ISDN
 
 if ISDN
 
-menu "Old ISDN4Linux"
+source "drivers/isdn/mISDN/Kconfig"
 
-config ISDN_I4L
+menuconfig ISDN_I4L
        tristate "Old ISDN4Linux (deprecated)"
        ---help---
          This driver allows you to use an ISDN adapter for networking
@@ -45,20 +45,20 @@ if ISDN_I4L
 source "drivers/isdn/i4l/Kconfig"
 endif
 
-endmenu
-
-comment "CAPI subsystem"
-
-config ISDN_CAPI
-       tristate "CAPI2.0 support"
+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"
 
+endif # ISDN_CAPI
+
 endif # ISDN