Skip to content

Commit

Permalink
staging: comedi: Move COMEDI_NI_LABPC config option
Browse files Browse the repository at this point in the history
Move the CONFIG_COMEDI_NI_LABPC option ("NI Lab-PC and compatibles ISA
and PCI support") from the CONFIG_COMEDI_NI_COMMON menu ("Comedi
National Instruments card support  --->") to the
CONFIG_COMEDI_PCI_DRIVERS menu ("Comedi PCI drivers  --->").

It currently depends on PCI but should be split up into separate ISA and
PCI config options eventually as was done for the "das08" driver.  For
now, the PCI card menu seems the best place for it and I plan to get rid
of the CONFIG_COMEDI_NI_COMMON menu altogether.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Jun 26, 2012
1 parent ea8d385 commit 2f2ac8e
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions drivers/staging/comedi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,21 @@ config COMEDI_NI_670X
To compile this driver as a module, choose M here: the module will be
called ni_670x.

config COMEDI_NI_LABPC
tristate "NI Lab-PC and compatibles ISA and PCI support"
depends on COMEDI_MITE
select COMEDI_8255
select COMEDI_FC
depends on VIRT_TO_BUS
---help---
Enable support for National Instruments Lab-PC and compatibles
Lab-PC-1200, Lab-PC-1200AI, Lab-PC+ and PCI-1200.
Kernel-level ISA plug-and-play support for the lab-pc-1200 boards has
not yet been added to the driver.

To compile this driver as a module, choose M here: the module will be
called ni_labpc.

config COMEDI_NI_PCIDIO
tristate "NI PCI-DIO32HS, PCI-DIO96, PCI-6533, PCI-6503 support"
depends on COMEDI_MITE
Expand Down Expand Up @@ -1277,21 +1292,6 @@ config COMEDI_NI_TIOCMD
To compile this driver as a module, choose M here: the module will
be called ni_tiocmd.

config COMEDI_NI_LABPC
tristate "NI Lab-PC and compatibles ISA and PCI support"
depends on COMEDI_MITE
select COMEDI_8255
select COMEDI_FC
depends on VIRT_TO_BUS
---help---
Enable support for National Instruments Lab-PC and compatibles
Lab-PC-1200, Lab-PC-1200AI, Lab-PC+ and PCI-1200.
Kernel-level ISA plug-and-play support for the lab-pc-1200 boards has
not yet been added to the driver.

To compile this driver as a module, choose M here: the module will be
called ni_labpc.

endif # COMEDI_NI_COMMON

config COMEDI_8255
Expand Down

0 comments on commit 2f2ac8e

Please sign in to comment.