Merge tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / staging / comedi / Kconfig

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 2093403af2537e87e14ce18a463c92bd871fa6d1..7de2a10213bd9d49294daa57430992e6934168ea 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -568,7 +568,6 @@ config COMEDI_8255_PCI
 
 config COMEDI_ADDI_APCI_035
        tristate "ADDI-DATA APCI_035 support"
-       depends on VIRT_TO_BUS
        ---help---
          Enable support for ADDI-DATA APCI_035 cards
 
@@ -577,7 +576,6 @@ config COMEDI_ADDI_APCI_035
 
 config COMEDI_ADDI_APCI_1032
        tristate "ADDI-DATA APCI_1032 support"
-       depends on VIRT_TO_BUS
        ---help---
          Enable support for ADDI-DATA APCI_1032 cards
 
@@ -586,7 +584,6 @@ config COMEDI_ADDI_APCI_1032
 
 config COMEDI_ADDI_APCI_1500
        tristate "ADDI-DATA APCI_1500 support"
-       depends on VIRT_TO_BUS
        ---help---
          Enable support for ADDI-DATA APCI_1500 cards
 
@@ -594,17 +591,17 @@ config COMEDI_ADDI_APCI_1500
          called addi_apci_1500.
 
 config COMEDI_ADDI_APCI_1516
-       tristate "ADDI-DATA APCI_1516 support"
-       depends on VIRT_TO_BUS
+       tristate "ADDI-DATA APCI-1016/1516/2016 support"
        ---help---
-         Enable support for ADDI-DATA APCI_1516 cards
+         Enable support for ADDI-DATA APCI-1016, APCI-1516 and APCI-2016 boards.
+         These are 16 channel, optically isolated, digital I/O boards. The 1516
+         and 2016 boards also have a watchdog for resetting the outputs to "0".
 
          To compile this driver as a module, choose M here: the module will be
          called addi_apci_1516.
 
 config COMEDI_ADDI_APCI_1564
        tristate "ADDI-DATA APCI_1564 support"
-       depends on VIRT_TO_BUS
        ---help---
          Enable support for ADDI-DATA APCI_1564 cards
 
@@ -613,25 +610,14 @@ config COMEDI_ADDI_APCI_1564
 
 config COMEDI_ADDI_APCI_16XX
        tristate "ADDI-DATA APCI_16xx support"
-       depends on VIRT_TO_BUS
        ---help---
          Enable support for ADDI-DATA APCI_16xx cards
 
          To compile this driver as a module, choose M here: the module will be
          called addi_apci_16xx.
 
-config COMEDI_ADDI_APCI_2016
-       tristate "ADDI-DATA APCI_2016 support"
-       depends on VIRT_TO_BUS
-       ---help---
-         Enable support for ADDI-DATA APCI_2016 cards
-
-         To compile this driver as a module, choose M here: the module will be
-         called addi_apci_2016.
-
 config COMEDI_ADDI_APCI_2032
        tristate "ADDI-DATA APCI_2032 support"
-       depends on VIRT_TO_BUS
        ---help---
          Enable support for ADDI-DATA APCI_2032 cards
 
@@ -640,36 +626,24 @@ config COMEDI_ADDI_APCI_2032
 
 config COMEDI_ADDI_APCI_2200
        tristate "ADDI-DATA APCI_2200 support"
-       depends on VIRT_TO_BUS
        ---help---
          Enable support for ADDI-DATA APCI_2200 cards
 
          To compile this driver as a module, choose M here: the module will be
          called addi_apci_2200.
 
-config COMEDI_ADDI_APCI_3001
-       tristate "ADDI-DATA APCI_3001 support"
-       depends on VIRT_TO_BUS
-       select COMEDI_FC
-       ---help---
-         Enable support for ADDI-DATA APCI_3001 cards
-
-         To compile this driver as a module, choose M here: the module will be
-         called addi_apci_3001.
-
 config COMEDI_ADDI_APCI_3120
-       tristate "ADDI-DATA APCI_3520 support"
+       tristate "ADDI-DATA APCI_3120/3001 support"
        depends on VIRT_TO_BUS
        select COMEDI_FC
        ---help---
-         Enable support for ADDI-DATA APCI_3520 cards
+         Enable support for ADDI-DATA APCI_3120/3001 cards
 
          To compile this driver as a module, choose M here: the module will be
          called addi_apci_3120.
 
 config COMEDI_ADDI_APCI_3501
        tristate "ADDI-DATA APCI_3501 support"
-       depends on VIRT_TO_BUS
        ---help---
          Enable support for ADDI-DATA APCI_3501 cards
 
@@ -678,7 +652,6 @@ config COMEDI_ADDI_APCI_3501
 
 config COMEDI_ADDI_APCI_3XXX
        tristate "ADDI-DATA APCI_3xxx support"
-       depends on VIRT_TO_BUS
        ---help---
          Enable support for ADDI-DATA APCI_3xxx cards
 
@@ -761,10 +734,11 @@ config COMEDI_ADV_PCI_DIO
          called adv_pci_dio.
 
 config COMEDI_AMPLC_DIO200_PCI
-       tristate "Amplicon PCI215 and PCI272 DIO board support"
+       tristate "Amplicon PCI215/PCI272/PCIe215/PCIe236/PCIe296 DIO support"
        select COMEDI_AMPLC_DIO200
        ---help---
-         Enable support for Amplicon PCI215 and PCI272 DIO boards.
+         Enable support for Amplicon PCI215, PCI272, PCIe215, PCIe236
+         and PCIe296 DIO boards.
 
          To compile this driver as a module, choose M here: the module will be
          called amplc_dio200.
@@ -1263,7 +1237,6 @@ config COMEDI_FC
 
 config COMEDI_AMPLC_DIO200
        tristate
-       select COMEDI_8255
 
 config COMEDI_AMPLC_PC236
        tristate