Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[powerpc.git] / drivers / atm / Kconfig

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 5b4fab2..b554eda 100644 (file)
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -6,6 +6,11 @@ menuconfig ATM_DRIVERS
        bool "ATM drivers"
        depends on NETDEVICES && ATM
        default y
        bool "ATM drivers"
        depends on NETDEVICES && ATM
        default y

+       ---help---
+         Say Y here to get to see options for Asynchronous Transfer Mode
+         device drivers. This option alone does not add any kernel code.
+
+         If you say N, all options in this submenu will be skipped and disabled.

 
 if ATM_DRIVERS && NETDEVICES && ATM
 
 
 if ATM_DRIVERS && NETDEVICES && ATM
 


@@ -142,7 +147,7 @@ config ATM_ENI_BURST_RX_2W
 
 config ATM_FIRESTREAM
        tristate "Fujitsu FireStream (FS50/FS155) "
 
 config ATM_FIRESTREAM
        tristate "Fujitsu FireStream (FS50/FS155) "

-       depends on PCI
+       depends on PCI && VIRT_TO_BUS

        help
          Driver for the Fujitsu FireStream 155 (MB86697) and
          FireStream 50 (MB86695) ATM PCI chips.
        help
          Driver for the Fujitsu FireStream 155 (MB86697) and
          FireStream 50 (MB86695) ATM PCI chips.


@@ -152,7 +157,7 @@ config ATM_FIRESTREAM
 
 config ATM_ZATM
        tristate "ZeitNet ZN1221/ZN1225"
 
 config ATM_ZATM
        tristate "ZeitNet ZN1221/ZN1225"

-       depends on PCI
+       depends on PCI && VIRT_TO_BUS

        help
          Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
          adapters.
        help
          Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
          adapters.


@@ -172,7 +177,7 @@ config ATM_ZATM_DEBUG
 
 config ATM_NICSTAR
        tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"
 
 config ATM_NICSTAR
        tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"

-       depends on PCI && !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
        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


@@ -240,7 +245,7 @@ config ATM_IDT77252_USE_SUNI
 
 config ATM_AMBASSADOR
        tristate "Madge Ambassador (Collage PCI 155 Server)"
 
 config ATM_AMBASSADOR
        tristate "Madge Ambassador (Collage PCI 155 Server)"

-       depends on PCI
+       depends on PCI && VIRT_TO_BUS

        select BITREVERSE
        help
          This is a driver for ATMizer based ATM card produced by Madge
        select BITREVERSE
        help
          This is a driver for ATMizer based ATM card produced by Madge


@@ -265,7 +270,7 @@ config ATM_AMBASSADOR_DEBUG
 
 config ATM_HORIZON
        tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
 
 config ATM_HORIZON
        tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"

-       depends on PCI
+       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
        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