[PATCH 4/4] staging: comedi: Move COMEDI_MITE and COMEDI_NI_TIOCMD

Ian Abbott abbotti at mev.co.uk
Mon Jun 25 18:49:38 UTC 2012


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 at mev.co.uk>
---
 drivers/staging/comedi/Kconfig |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 9ff3f4d..6cee785 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -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
@@ -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---
@@ -1290,4 +1286,7 @@ config COMEDI_DAS08
 	tristate
 	select COMEDI_8255
 
+config COMEDI_NI_TIO
+	tristate
+
 endif # COMEDI
-- 
1.7.8.6




More information about the devel mailing list