Merge 3.18-rc3 into staging-next

[uclinux-h8/linux.git] / drivers / staging / comedi / Kconfig

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 152f4c1..b2d68ec 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -595,14 +595,6 @@ config COMEDI_ADDI_WATCHDOG
          boards. This module will be automatically selected when needed. The
          module will be called addi_watchdog.
 
-config COMEDI_ADDI_APCI_035
-       tristate "ADDI-DATA APCI_035 support"
-       ---help---
-         Enable support for ADDI-DATA APCI_035 cards
-
-         To compile this driver as a module, choose M here: the module will be
-         called addi_apci_035.
-
 config COMEDI_ADDI_APCI_1032
        tristate "ADDI-DATA APCI_1032 support"
        ---help---
@@ -939,11 +931,11 @@ config COMEDI_CB_PCIDDA
          called cb_pcidda.
 
 config COMEDI_CB_PCIMDAS
-       tristate "MeasurementComputing PCIM-DAS1602/16 support"
+       tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support"
        select COMEDI_8255
        ---help---
          Enable support for ComputerBoards/MeasurementComputing PCI Migration
-         series PCIM-DAS1602/16
+         series PCIM-DAS1602/16 and PCIe-DAS1602/16.
 
          To compile this driver as a module, choose M here: the module will be
          called cb_pcimdas.