diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-13 17:24:00 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-14 03:13:03 (GMT) |
| commit | b37c1aeed89062a82da9bf78c83db0328d08e95d (patch) | |
| tree | 7a977bf0b329eebc069a7a4c5386b83a7de969d0 /drivers/staging/comedi/Kconfig | |
| parent | 77f17d3714675d1966d07f7e4939816f5cf52e04 (diff) | |
| download | linux-fsl-qoriq-b37c1aeed89062a82da9bf78c83db0328d08e95d.tar.xz | |
staging: comedi: 8255_pci: move ni_pcidio 8255 board support
The 8255 based boards in the ni_pcidio driver are all simple
memory mapped 8255 boards that don't require the dma support
provided by the mite driver.
Move the support for these boards from the ni_pcidio driver to
the generic 8255_pci driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/Kconfig')
| -rw-r--r-- | drivers/staging/comedi/Kconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig index 3f67b98..2093403 100644 --- a/drivers/staging/comedi/Kconfig +++ b/drivers/staging/comedi/Kconfig @@ -560,6 +560,8 @@ config COMEDI_8255_PCI 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. @@ -1030,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. |