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 1ecf2139717188d5335c1d9066c0f36ac25e6bb8..2093403af2537e87e14ce18a463c92bd871fa6d1 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -558,6 +558,10 @@ config COMEDI_8255_PCI
 
          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.
@@ -934,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
@@ -1038,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.