Skip to content

Commit

Permalink
staging: comedi: Move COMEDI_MITE and COMEDI_NI_TIOCMD
Browse files Browse the repository at this point in the history
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: 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 7ac21b8 commit a771988
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions drivers/staging/comedi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,14 @@ config COMEDI_SSV_DNP
To compile this driver as a module, choose M here: the module will be
called ssv_dnp.

config COMEDI_MITE
tristate

config COMEDI_NI_TIOCMD
tristate
select COMEDI_NI_TIO
select COMEDI_MITE

endif # COMEDI_PCI_DRIVERS

menuconfig COMEDI_PCMCIA_DRIVERS
Expand Down Expand Up @@ -1245,18 +1253,6 @@ config COMEDI_VMK80XX

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
tristate "Generic 8255 support"
---help---
Expand Down Expand Up @@ -1290,4 +1286,7 @@ config COMEDI_DAS08
tristate
select COMEDI_8255

config COMEDI_NI_TIO
tristate

endif # COMEDI

0 comments on commit a771988

Please sign in to comment.