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

[linux-2.6] / drivers / atm / Kconfig

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 5b4fab24155f98105473683ff9145b46e5d3ee22..f197a193633aebd3f1f8964c34cbf4c9bffd72b3 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


@@ -289,7 +294,7 @@ config ATM_HORIZON_DEBUG
 
 config ATM_IA
        tristate "Interphase ATM PCI x575/x525/x531"
 
 config ATM_IA
        tristate "Interphase ATM PCI x575/x525/x531"

-       depends on PCI && !64BIT
+       depends on PCI

        ---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
        ---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


@@ -320,81 +325,22 @@ config ATM_IA_DEBUG
          speed of the driver, and the size of your syslog files! When
          inactive, they will have only a modest impact on performance.
 
          speed of the driver, and the size of your syslog files! When
          inactive, they will have only a modest impact on performance.
 

-config ATM_FORE200E_MAYBE
+config ATM_FORE200E

        tristate "FORE Systems 200E-series"
        tristate "FORE Systems 200E-series"

-       depends on PCI || SBUS
+       depends on (PCI || SBUS)
+       select FW_LOADER

        ---help---
          This is a driver for the FORE Systems 200E-series ATM adapter
          cards. It simultaneously supports PCA-200E and SBA-200E models
          on PCI and SBUS hosts. Say Y (or M to compile as a module
          named fore_200e) here if you have one of these ATM adapters.
 
        ---help---
          This is a driver for the FORE Systems 200E-series ATM adapter
          cards. It simultaneously supports PCA-200E and SBA-200E models
          on PCI and SBUS hosts. Say Y (or M to compile as a module
          named fore_200e) here if you have one of these ATM adapters.
 

-         Note that the driver will actually be compiled only if you
-         additionally enable the support for PCA-200E and/or SBA-200E
-         cards.
-

          See the file <file:Documentation/networking/fore200e.txt> for
          further details.
 
          See the file <file:Documentation/networking/fore200e.txt> for
          further details.
 

-config ATM_FORE200E_PCA
-       bool "PCA-200E support"
-       depends on ATM_FORE200E_MAYBE && PCI
-       help
-         Say Y here if you want your PCA-200E cards to be probed.
-
-config ATM_FORE200E_PCA_DEFAULT_FW
-       bool "Use default PCA-200E firmware (normally enabled)"
-       depends on ATM_FORE200E_PCA
-       help
-         Use the default PCA-200E firmware data shipped with the driver.
-
-         Normal users do not have to deal with the firmware stuff, so
-         they should say Y here.
-
-config ATM_FORE200E_PCA_FW
-       string "Pathname of user-supplied binary firmware"
-       depends on ATM_FORE200E_PCA && !ATM_FORE200E_PCA_DEFAULT_FW
-       default ""
-       help
-         This defines the pathname of an alternative PCA-200E binary
-         firmware image supplied by the user. This pathname may be
-         absolute or relative to the drivers/atm directory.
-
-         The driver comes with an adequate firmware image, so normal users do
-         not have to supply an alternative one. They just say Y to "Use
-         default PCA-200E firmware" instead.
-
-config ATM_FORE200E_SBA
-       bool "SBA-200E support"
-       depends on ATM_FORE200E_MAYBE && SBUS
-       help
-         Say Y here if you want your SBA-200E cards to be probed.
-
-config ATM_FORE200E_SBA_DEFAULT_FW
-       bool "Use default SBA-200E firmware (normally enabled)"
-       depends on ATM_FORE200E_SBA
-       help
-         Use the default SBA-200E firmware data shipped with the driver.
-
-         Normal users do not have to deal with the firmware stuff, so
-         they should say Y here.
-
-config ATM_FORE200E_SBA_FW
-       string "Pathname of user-supplied binary firmware"
-       depends on ATM_FORE200E_SBA && !ATM_FORE200E_SBA_DEFAULT_FW
-       default ""
-       help
-         This defines the pathname of an alternative SBA-200E binary
-         firmware image supplied by the user. This pathname may be
-         absolute or relative to the drivers/atm directory.
-
-         The driver comes with an adequate firmware image, so normal users do
-         not have to supply an alternative one. They just say Y to "Use
-         default SBA-200E firmware", above.
-

 config ATM_FORE200E_USE_TASKLET
        bool "Defer interrupt work to a tasklet"
 config ATM_FORE200E_USE_TASKLET
        bool "Defer interrupt work to a tasklet"

-       depends on (PCI || SBUS) && (ATM_FORE200E_PCA || ATM_FORE200E_SBA)
+       depends on ATM_FORE200E

        default n
        help
          This defers work to be done by the interrupt handler to a
        default n
        help
          This defers work to be done by the interrupt handler to a


@@ -403,7 +349,7 @@ config ATM_FORE200E_USE_TASKLET
 
 config ATM_FORE200E_TX_RETRY
        int "Maximum number of tx retries"
 
 config ATM_FORE200E_TX_RETRY
        int "Maximum number of tx retries"

-       depends on (PCI || SBUS) && (ATM_FORE200E_PCA || ATM_FORE200E_SBA)
+       depends on ATM_FORE200E

        default "16"
        ---help---
          Specifies the number of times the driver attempts to transmit
        default "16"
        ---help---
          Specifies the number of times the driver attempts to transmit


@@ -420,7 +366,7 @@ config ATM_FORE200E_TX_RETRY
 
 config ATM_FORE200E_DEBUG
        int "Debugging level (0-3)"
 
 config ATM_FORE200E_DEBUG
        int "Debugging level (0-3)"

-       depends on (PCI || SBUS) && (ATM_FORE200E_PCA || ATM_FORE200E_SBA)
+       depends on ATM_FORE200E

        default "0"
        help
          Specifies the level of debugging messages issued by the driver.
        default "0"
        help
          Specifies the level of debugging messages issued by the driver.


@@ -431,12 +377,6 @@ config ATM_FORE200E_DEBUG
          the performances of the driver, and the size of your syslog files!
          Keep the debugging level to 0 during normal operations.
 
          the performances of the driver, and the size of your syslog files!
          Keep the debugging level to 0 during normal operations.
 

-config ATM_FORE200E
-       tristate
-       depends on (PCI || SBUS) && (ATM_FORE200E_PCA || ATM_FORE200E_SBA)
-       default m if ATM_FORE200E_MAYBE!=y
-       default y if ATM_FORE200E_MAYBE=y
-

 config ATM_HE
        tristate "ForeRunner HE Series"
        depends on PCI
 config ATM_HE
        tristate "ForeRunner HE Series"
        depends on PCI