staging: comedi: ii_pci20kc: this is an ISA board not a PCI board

The Intelligent Instrumentation PCI-20001C board is a legacy PC/XT/AT
8-bit ISA board not a PCI board.  The "PCI" appears to mean "Personal
Computer Instrumentation".

Move the Kconfig option into the COMEDI_ISA group.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 8c8a551322572630543ec85ddae126c6de08e732..e336ee8a8e32b4fffed570392e480f773c77015d 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -403,6 +403,15 @@ config COMEDI_AIO_IIRO_16
          To compile this driver as a module, choose M here: the module will be
          called aio_iiro_16.
 
+config COMEDI_II_PCI20KC
+       tristate "Intelligent Instruments PCI-20001C carrier support"
+       ---help---
+         Enable support for Intelligent Instruments PCI-20001C carrier
+         PCI-20001, PCI-20006 and PCI-20341
+
+         To compile this driver as a module, choose M here: the module will be
+         called ii_pci20kc.
+
 config COMEDI_C6XDIGIO
        tristate "Mechatronic Systems Inc. C6x_DIGIO DSP daughter card support"
        ---help---
@@ -866,15 +875,6 @@ config COMEDI_ICP_MULTI
          To compile this driver as a module, choose M here: the module will be
          called icp_multi.
 
-config COMEDI_II_PCI20KC
-       tristate "Intelligent Instruments PCI-20001C carrier support"
-       ---help---
-         Enable support for Intelligent Instruments PCI-20001C carrier
-         PCI-20001, PCI-20006 and PCI-20341
-
-         To compile this driver as a module, choose M here: the module will be
-         called ii_pci20kc.
-
 config COMEDI_DAQBOARD2000
        tristate "IOtech DAQboard/2000 support"
        select COMEDI_8255

diff --git a/drivers/staging/comedi/drivers/Makefile b/drivers/staging/comedi/drivers/Makefile
index dbb93e332487ed505884e0f3ddc1072544b881fb..643e5517cba49767b602d4963e8d9d37226de1ff 100644 (file)
--- a/drivers/staging/comedi/drivers/Makefile
+++ b/drivers/staging/comedi/drivers/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_COMEDI_DMM32AT)          += dmm32at.o
 obj-$(CONFIG_COMEDI_FL512)             += fl512.o
 obj-$(CONFIG_COMEDI_AIO_AIO12_8)       += aio_aio12_8.o
 obj-$(CONFIG_COMEDI_AIO_IIRO_16)       += aio_iiro_16.o
+obj-$(CONFIG_COMEDI_II_PCI20KC)                += ii_pci20kc.o
 obj-$(CONFIG_COMEDI_C6XDIGIO)          += c6xdigio.o
 obj-$(CONFIG_COMEDI_MPC624)            += mpc624.o
 obj-$(CONFIG_COMEDI_ADQ12B)            += adq12b.o
@@ -89,7 +90,6 @@ obj-$(CONFIG_COMEDI_DYNA_PCI10XX)     += dyna_pci10xx.o
 obj-$(CONFIG_COMEDI_UNIOXX5)           += unioxx5.o
 obj-$(CONFIG_COMEDI_GSC_HPDI)          += gsc_hpdi.o
 obj-$(CONFIG_COMEDI_ICP_MULTI)         += icp_multi.o
-obj-$(CONFIG_COMEDI_II_PCI20KC)                += ii_pci20kc.o
 obj-$(CONFIG_COMEDI_DAQBOARD2000)      += daqboard2000.o
 obj-$(CONFIG_COMEDI_JR3_PCI)           += jr3_pci.o
 obj-$(CONFIG_COMEDI_KE_COUNTER)                += ke_counter.o