Commit a7719881 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: Move COMEDI_MITE and COMEDI_NI_TIOCMD

Move the CONFIG_COMEDI_MITE config options into the `if
COMEDI_PCI_DRIVERS` block so that the `depends on PCI` condition can be
omitted.  Move the CONFIG_COMEDI_NI_TIOCMD config option to the same
block as it selects COMEDI_MITE.  Move the CONFIG_COEMDI_NI_TIO config
option slightly for aesthetic reasons without changing its conditions.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ac21b82
...@@ -1105,6 +1105,14 @@ config COMEDI_SSV_DNP ...@@ -1105,6 +1105,14 @@ config COMEDI_SSV_DNP
To compile this driver as a module, choose M here: the module will be To compile this driver as a module, choose M here: the module will be
called ssv_dnp. called ssv_dnp.
config COMEDI_MITE
tristate
config COMEDI_NI_TIOCMD
tristate
select COMEDI_NI_TIO
select COMEDI_MITE
endif # COMEDI_PCI_DRIVERS endif # COMEDI_PCI_DRIVERS
menuconfig COMEDI_PCMCIA_DRIVERS menuconfig COMEDI_PCMCIA_DRIVERS
...@@ -1245,18 +1253,6 @@ config COMEDI_VMK80XX ...@@ -1245,18 +1253,6 @@ config COMEDI_VMK80XX
endif # COMEDI_USB_DRIVERS endif # COMEDI_USB_DRIVERS
config COMEDI_MITE
tristate
depends on PCI
config COMEDI_NI_TIO
tristate
config COMEDI_NI_TIOCMD
tristate
select COMEDI_NI_TIO
select COMEDI_MITE
config COMEDI_8255 config COMEDI_8255
tristate "Generic 8255 support" tristate "Generic 8255 support"
---help--- ---help---
...@@ -1290,4 +1286,7 @@ config COMEDI_DAS08 ...@@ -1290,4 +1286,7 @@ config COMEDI_DAS08
tristate tristate
select COMEDI_8255 select COMEDI_8255
config COMEDI_NI_TIO
tristate
endif # COMEDI endif # COMEDI
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment