These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / comedi / Kconfig

diff --git a/kernel/drivers/staging/comedi/Kconfig b/kernel/drivers/staging/comedi/Kconfig
index 61c6351..ac0f010 100644 (file)
--- a/kernel/drivers/staging/comedi/Kconfig
+++ b/kernel/drivers/staging/comedi/Kconfig
@@ -2,7 +2,7 @@ config COMEDI
        tristate "Data acquisition support (comedi)"
        depends on m
        ---help---
-         Enable support a wide range of data acquisition devices
+         Enable support for a wide range of data acquisition devices
          for Linux.
 
 if COMEDI
@@ -400,14 +400,6 @@ config COMEDI_DMM32AT
          To compile this driver as a module, choose M here: the module will be
          called dmm32at.
 
-config COMEDI_UNIOXX5
-       tristate "Fastwel UNIOxx-5 analog and digital io board support"
-       ---help---
-         Enable support for Fastwel UNIOxx-5 (analog and digital i/o) boards
-
-         To compile this driver as a module, choose M here: the module will be
-         called unioxx5.
-
 config COMEDI_FL512
        tristate "FL512 ISA card support"
        ---help---
@@ -418,6 +410,7 @@ config COMEDI_FL512
 
 config COMEDI_AIO_AIO12_8
        tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support"
+       select COMEDI_8254
        select COMEDI_8255
        ---help---
          Enable support for I/O Products PC/104 AIO12-8 Analog I/O Board
@@ -1072,6 +1065,7 @@ config COMEDI_NI_PCIMIO
 
 config COMEDI_RTD520
        tristate "Real Time Devices PCI4520/DM7520 support"
+       select COMEDI_8254
        ---help---
          Enable support for Real Time Devices PCI4520/DM7520
 
@@ -1247,16 +1241,22 @@ config COMEDI_8254
        tristate
 
 config COMEDI_8255
-       tristate "Generic 8255 support"
+       tristate
+
+config COMEDI_8255_SA
+       tristate "Standalone 8255 support"
+       select COMEDI_8255
        ---help---
-         Enable generic 8255 support.
+         Enable support for 8255 digital I/O as a standalone driver.
 
          You should enable compilation this driver if you plan to use a board
-         that has an 8255 chip. For multifunction boards, the main driver will
-         configure the 8255 subdevice automatically.
+         that has an 8255 chip at a known I/O base address and there are no
+         other Comedi drivers for the board.
 
-         Note that most PCI based 8255 boards use the 8255_pci driver as a
-         wrapper around this driver.
+         Note that Comedi drivers for most multi-function boards incorporating
+         an 8255 chip use the 'comedi_8255' module.  Most PCI-based 8255
+         boards use the 8255_pci driver as a wrapper around the 'comedi_8255'
+         module.
 
          To compile this driver as a module, choose M here: the module will be
          called 8255.