From 9f3a7738081d12eef6acf89742a6e568e89b4e03 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 27 Aug 2014 20:37:18 +0100 Subject: [PATCH] staging: comedi: Kconfig: make COMEDI_BOND select COMEDI_KCOMEDILIB Currently, to select the "comedi_bond" driver, the "kcomedilib" support has to be selected first. It seems more natural to allow the "comedi_bond" driver to be selected on its own and to automatically select the "kcomedilib" module as a result of that. Change the dependency/select relationship between the two configuration options to do that. Also, make "kcomedilib" a module that can be selected independently, perhaps for use by out-of-tree modules, although it is not terribly useful for anything other than "comedi_bond" currently. Also, improve the help text for the config options. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/Kconfig | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig index 7d6cebc112dc..beb5704ec55e 100644 --- a/drivers/staging/comedi/Kconfig +++ b/drivers/staging/comedi/Kconfig @@ -42,18 +42,15 @@ menuconfig COMEDI_MISC_DRIVERS if COMEDI_MISC_DRIVERS -config COMEDI_KCOMEDILIB - tristate "Comedi kcomedilib" - ---help--- - Build the kcomedilib - config COMEDI_BOND - tristate "Device bonding support" - depends on COMEDI_KCOMEDILIB + tristate "Comedi device bonding support" + select COMEDI_KCOMEDILIB ---help--- Enable support for a driver to 'bond' (merge) multiple subdevices from multiple devices together as one. + Currently, it only handles digital I/O subdevices. + To compile this driver as a module, choose M here: the module will be called comedi_bond. @@ -1272,6 +1269,20 @@ config COMEDI_8255 To compile this driver as a module, choose M here: the module will be called 8255. +config COMEDI_KCOMEDILIB + tristate "Comedi kcomedilib" + ---help--- + Build the kcomedilib. + + This is a kernel module used to open and manipulate Comedi devices + from within kernel code. It is currently only used by the + comedi_bond driver, and its functionality has been stripped down to + the needs of that driver, so is currently not very useful for + anything else. + + To compile kcomedilib as a module, choose M here: the module will be + called kcomedilib. + config COMEDI_FC tristate