Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / drivers / staging / comedi / Kconfig

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 6cee7855b019aabf447c3b53bb86db17d9d56e6b..2093403af2537e87e14ce18a463c92bd871fa6d1 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -549,6 +549,23 @@ menuconfig COMEDI_PCI_DRIVERS
 
 if COMEDI_PCI_DRIVERS
 
+config COMEDI_8255_PCI
+       tristate "Generic PCI based 8255 digital i/o board support"
+       select COMEDI_8255
+       ---help---
+         Enable support for PCI based 8255 digital i/o boards. This driver
+         provides a PCI wrapper around the generic 8255 driver.
+
+         Supported boards:
+           ADlink - PCI-7224, PCI-7248, and PCI-7296
+           Measurement Computing - PCI-DIO24, PCI-DIO24H, PCI-DIO48H and
+                                   PCI-DIO96H
+           National Instruments - PCI-DIO-96, PCI-DIO-96B, PXI-6508, PCI-6503,
+                                  PCI-6503B, PCI-6503X, and PXI-6503
+
+         To compile this driver as a module, choose M here: the module will
+         be called 8255_pci.
+
 config COMEDI_ADDI_APCI_035
        tristate "ADDI-DATA APCI_035 support"
        depends on VIRT_TO_BUS
@@ -676,30 +693,16 @@ config COMEDI_ADL_PCI6208
          To compile this driver as a module, choose M here: the module will be
          called adl_pci6208.
 
-config COMEDI_ADL_PCI7230
-       tristate "ADLink PCI-7230 digital io board support"
-       ---help---
-         Enable support for ADlink PCI-7230 digital io board support
-
-         To compile this driver as a module, choose M here: the module will be
-         called adl_pci7230.
-
-config COMEDI_ADL_PCI7296
-       tristate "ADLink PCI-7296 96 ch. digital io board support"
-       select COMEDI_8255
+config COMEDI_ADL_PCI7X3X
+       tristate "ADLink PCI-723X/743X isolated digital i/o board support"
        ---help---
-         Enable support for ADlink PCI-7296 96 ch. digital io board support
+         Enable support for ADlink PCI-723X/743X isolated digital i/o boards.
+         Supported boards include the 32-channel PCI-7230 (16 in/16 out),
+         PCI-7233 (32 in), and PCI-7234 (32 out) as well as the 64-channel
+         PCI-7432 (32 in/32 out), PCI-7433 (64 in), and PCI-7434 (64 out).
 
          To compile this driver as a module, choose M here: the module will be
-         called adl_pci7296.
-
-config COMEDI_ADL_PCI7432
-       tristate "ADLink PCI-7432 64 ch. isolated digital io board support"
-       ---help---
-         Enable support for ADlink PCI-7432 64 ch. isolated digital io board
-
-         To compile this driver as a module, choose M here: the module will be
-         called adl_pci7432.
+         called adl_pci7x3x.
 
 config COMEDI_ADL_PCI8164
        tristate "ADLink PCI-8164 4 Axes Motion Control board support"
@@ -935,16 +938,6 @@ config COMEDI_CB_PCIDDA
          To compile this driver as a module, choose M here: the module will be
          called cb_pcidda.
 
-config COMEDI_CB_PCIDIO
-       tristate "MeasurementComputing PCI-DIO series support"
-       select COMEDI_8255
-       ---help---
-         Enable support for ComputerBoards/MeasurementComputing PCI-DIO series
-         PCI-DIO24, PCI-DIO24H and PCI-DIO48H
-
-         To compile this driver as a module, choose M here: the module will be
-         called cb_pcidio.
-
 config COMEDI_CB_PCIMDAS
        tristate "MeasurementComputing PCIM-DAS1602/16 support"
        select COMEDI_8255
@@ -1039,15 +1032,12 @@ config COMEDI_NI_LABPC
          called ni_labpc.
 
 config COMEDI_NI_PCIDIO
-       tristate "NI PCI-DIO32HS, PCI-DIO96, PCI-6533, PCI-6503 support"
+       tristate "NI PCI-DIO32HS, PCI-6533, PCI-6534 support"
        select COMEDI_MITE
        select COMEDI_8255
        ---help---
          Enable support for National Instruments PCI-DIO-32HS, PXI-6533,
-         PCI-DIO-96, PCI-DIO-96B, PXI-6508, PCI-6503, PCI-6503B, PCI-6503X,
-         PXI-6503, PCI-6533 and PCI-6534
-         The DIO-96 appears as four 8255 subdevices. See the 8255
-         driver notes for details.
+         PCI-6533 and PCI-6534
 
          To compile this driver as a module, choose M here: the module will be
          called ni_pcidio.
@@ -1262,8 +1252,8 @@ config COMEDI_8255
          that has an 8255 chip. For multifunction boards, the main driver will
          configure the 8255 subdevice automatically.
 
-         Note that most PCI 8255 boards do NOT work with this driver, and
-         need a separate driver as a wrapper.
+         Note that most PCI based 8255 boards use the 8255_pci driver as a
+         wrapper around this driver.
 
          To compile this driver as a module, choose M here: the module will be
          called 8255.