Merge branches 'ns9x' and 'machtypes' into devel

[linux-2.6-omap-h63xx.git] / drivers / isdn / hardware / eicon / Kconfig

diff --git a/drivers/isdn/hardware/eicon/Kconfig b/drivers/isdn/hardware/eicon/Kconfig
index 01d4afd9d8431a8d31332d390581fad16444105d..6082b6a5ced3886ade5b2027650b16ea1529dc7d 100644 (file)
--- a/drivers/isdn/hardware/eicon/Kconfig
+++ b/drivers/isdn/hardware/eicon/Kconfig
@@ -2,52 +2,50 @@
 # ISDN DIVAS Eicon driver
 #
 
-menu "Active Eicon DIVA Server cards"
-       depends on NET && ISDN && ISDN_CAPI!=n
-
-config CAPI_EICON
-       bool "Support Eicon cards"
+menuconfig CAPI_EICON
+       bool "Active Eicon DIVA Server cards"
        help
          Enable support for Eicon Networks active ISDN cards.
 
+if CAPI_EICON
+
 config ISDN_DIVAS
        tristate "Support Eicon DIVA Server cards"
-       depends on CAPI_EICON && PROC_FS && PCI
+       depends on PROC_FS && PCI
        help
          Say Y here if you have an Eicon Networks DIVA Server PCI ISDN card.
          In order to use this card, additional firmware is necessary, which
          has to be downloaded into the card using the divactrl utility.
 
+if ISDN_DIVAS
+
 config ISDN_DIVAS_BRIPCI
        bool "DIVA Server BRI/PCI support"
-       depends on ISDN_DIVAS
        help
          Enable support for DIVA Server BRI-PCI.
 
 config ISDN_DIVAS_PRIPCI
        bool "DIVA Server PRI/PCI support"
-       depends on ISDN_DIVAS
        help
          Enable support for DIVA Server PRI-PCI.
 
 config ISDN_DIVAS_DIVACAPI
        tristate "DIVA CAPI2.0 interface support"
-       depends on ISDN_DIVAS && ISDN_CAPI
        help
          You need this to provide the CAPI interface
          for DIVA Server cards.
 
 config ISDN_DIVAS_USERIDI
        tristate "DIVA User-IDI interface support"
-       depends on ISDN_DIVAS
        help
          Enable support for user-mode IDI interface.
 
 config ISDN_DIVAS_MAINT
        tristate "DIVA Maint driver support"
-       depends on ISDN_DIVAS && m
+       depends on m
        help
          Enable Divas Maintenance driver.
 
-endmenu
+endif # ISDN_DIVAS
 
+endif # CAPI_EICON