Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...

[cascardo/linux.git] / drivers / atm / Kconfig

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 2ddd76f..bed9f58 100644 (file)
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -2,19 +2,22 @@
 # ATM device configuration
 #
 
-menu "ATM drivers"
+menuconfig ATM_DRIVERS
+       bool "ATM drivers"
        depends on NETDEVICES && ATM
+       default y
+
+if ATM_DRIVERS && NETDEVICES && ATM
 
 config ATM_DUMMY
        tristate "Dummy ATM driver"
-       depends on ATM
        help
          Dummy ATM driver. Useful for proxy signalling, testing,
          and development.  If unsure, say N.
 
 config ATM_TCP
        tristate "ATM over TCP"
-       depends on INET && ATM
+       depends on INET
        help
          ATM over TCP driver. Useful mainly for development and for
          experiments. If unsure, say N.
@@ -30,7 +33,7 @@ config ATM_LANAI
 
 config ATM_ENI
        tristate "Efficient Networks ENI155P"
-       depends on PCI && ATM
+       depends on PCI
        ---help---
          Driver for the Efficient Networks ENI155p series and SMC ATM
          Power155 155 Mbps ATM adapters. Both, the versions with 512KB and
@@ -139,7 +142,7 @@ config ATM_ENI_BURST_RX_2W
 
 config ATM_FIRESTREAM
        tristate "Fujitsu FireStream (FS50/FS155) "
-       depends on PCI && ATM
+       depends on PCI && VIRT_TO_BUS
        help
          Driver for the Fujitsu FireStream 155 (MB86697) and
          FireStream 50 (MB86695) ATM PCI chips.
@@ -149,7 +152,7 @@ config ATM_FIRESTREAM
 
 config ATM_ZATM
        tristate "ZeitNet ZN1221/ZN1225"
-       depends on PCI && ATM
+       depends on PCI && VIRT_TO_BUS
        help
          Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
          adapters.
@@ -167,13 +170,9 @@ config ATM_ZATM_DEBUG
          Note that extended debugging may create certain race conditions
          itself. Enable this ONLY if you suspect problems with the driver.
 
-#   bool 'Rolfs TI TNETA1570' CONFIG_ATM_TNETA1570 y
-#   if [ "$CONFIG_ATM_TNETA1570" = "y" ]; then
-#      bool '  Enable extended debugging' CONFIG_ATM_TNETA1570_DEBUG n
-#   fi
 config ATM_NICSTAR
        tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"
-       depends on PCI && ATM && !64BIT
+       depends on PCI && !64BIT && VIRT_TO_BUS
        help
          The NICStAR chipset family is used in a large number of ATM NICs for
          25 and for 155 Mbps, including IDT cards and the Fore ForeRunnerLE
@@ -206,7 +205,7 @@ config ATM_NICSTAR_USE_IDT77105
 
 config ATM_IDT77252
        tristate "IDT 77252 (NICStAR II)"
-       depends on PCI && ATM
+       depends on PCI
        help
          Driver for the IDT 77252 ATM PCI chips.
 
@@ -241,7 +240,7 @@ config ATM_IDT77252_USE_SUNI
 
 config ATM_AMBASSADOR
        tristate "Madge Ambassador (Collage PCI 155 Server)"
-       depends on PCI && ATM
+       depends on PCI && VIRT_TO_BUS
        select BITREVERSE
        help
          This is a driver for ATMizer based ATM card produced by Madge
@@ -266,7 +265,7 @@ config ATM_AMBASSADOR_DEBUG
 
 config ATM_HORIZON
        tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
-       depends on PCI && ATM
+       depends on PCI && VIRT_TO_BUS
        help
          This is a driver for the Horizon chipset ATM adapter cards once
          produced by Madge Networks Ltd. Say Y (or M to compile as a module
@@ -290,7 +289,7 @@ config ATM_HORIZON_DEBUG
 
 config ATM_IA
        tristate "Interphase ATM PCI x575/x525/x531"
-       depends on PCI && ATM && !64BIT
+       depends on PCI && !64BIT
        ---help---
          This is a driver for the Interphase (i)ChipSAR adapter cards
          which include a variety of variants in term of the size of the
@@ -323,7 +322,7 @@ config ATM_IA_DEBUG
 
 config ATM_FORE200E_MAYBE
        tristate "FORE Systems 200E-series"
-       depends on (PCI || SBUS) && ATM
+       depends on PCI || SBUS
        ---help---
          This is a driver for the FORE Systems 200E-series ATM adapter
          cards. It simultaneously supports PCA-200E and SBA-200E models
@@ -440,7 +439,7 @@ config ATM_FORE200E
 
 config ATM_HE
        tristate "ForeRunner HE Series"
-       depends on PCI && ATM
+       depends on PCI
        help
          This is a driver for the Marconi ForeRunner HE-series ATM adapter
          cards. It simultaneously supports the 155 and 622 versions.
@@ -452,5 +451,4 @@ config ATM_HE_USE_SUNI
          Support for the S/UNI-Ultra and S/UNI-622 found in the ForeRunner
          HE cards.  This driver provides carrier detection some statistics.
 
-endmenu
-
+endif # ATM