Browse Source

drivers: pps: Make PPS into a menuconfig to ease disabling

So that there's no need to get into the submenu to disable all related config
entries.

The BROKEN PPS_GENERATOR_PARPORT now also depends on PPS

Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com>
Acked-by: Rodolfo Giometti <giometti@enneenne.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vincent Legoll 8 years ago
parent
commit
98e959d44b
3 changed files with 7 additions and 14 deletions
  1. 3 9
      drivers/pps/Kconfig
  2. 2 4
      drivers/pps/clients/Kconfig
  3. 2 1
      drivers/pps/generators/Kconfig

+ 3 - 9
drivers/pps/Kconfig

@@ -2,9 +2,7 @@
 # PPS support configuration
 # PPS support configuration
 #
 #
 
 
-menu "PPS support"
-
-config PPS
+menuconfig PPS
 	tristate "PPS support"
 	tristate "PPS support"
 	---help---
 	---help---
 	  PPS (Pulse Per Second) is a special pulse provided by some GPS
 	  PPS (Pulse Per Second) is a special pulse provided by some GPS
@@ -20,10 +18,10 @@ config PPS
 
 
 	  To compile this driver as a module, choose M here: the module
 	  To compile this driver as a module, choose M here: the module
 	  will be called pps_core.ko.
 	  will be called pps_core.ko.
-if PPS
 
 
 config PPS_DEBUG
 config PPS_DEBUG
 	bool "PPS debugging messages"
 	bool "PPS debugging messages"
+	depends on PPS
 	help
 	help
 	  Say Y here if you want the PPS support to produce a bunch of debug
 	  Say Y here if you want the PPS support to produce a bunch of debug
 	  messages to the system log.  Select this if you are having a
 	  messages to the system log.  Select this if you are having a
@@ -31,17 +29,13 @@ config PPS_DEBUG
 
 
 config NTP_PPS
 config NTP_PPS
 	bool "PPS kernel consumer support"
 	bool "PPS kernel consumer support"
-	depends on !NO_HZ_COMMON
+	depends on PPS && !NO_HZ_COMMON
 	help
 	help
 	  This option adds support for direct in-kernel time
 	  This option adds support for direct in-kernel time
 	  synchronization using an external PPS signal.
 	  synchronization using an external PPS signal.
 
 
 	  It doesn't work on tickless systems at the moment.
 	  It doesn't work on tickless systems at the moment.
 
 
-endif
-
 source drivers/pps/clients/Kconfig
 source drivers/pps/clients/Kconfig
 
 
 source drivers/pps/generators/Kconfig
 source drivers/pps/generators/Kconfig
-
-endmenu

+ 2 - 4
drivers/pps/clients/Kconfig

@@ -2,12 +2,12 @@
 # PPS clients configuration
 # PPS clients configuration
 #
 #
 
 
-if PPS
-
 comment "PPS clients support"
 comment "PPS clients support"
+	depends on PPS
 
 
 config PPS_CLIENT_KTIMER
 config PPS_CLIENT_KTIMER
 	tristate "Kernel timer client (Testing client, use for debug)"
 	tristate "Kernel timer client (Testing client, use for debug)"
+	depends on PPS
 	help
 	help
 	  If you say yes here you get support for a PPS debugging client
 	  If you say yes here you get support for a PPS debugging client
 	  which uses a kernel timer to generate the PPS signal.
 	  which uses a kernel timer to generate the PPS signal.
@@ -37,5 +37,3 @@ config PPS_CLIENT_GPIO
 	  GPIO. To be useful you must also register a platform device
 	  GPIO. To be useful you must also register a platform device
 	  specifying the GPIO pin and other options, usually in your board
 	  specifying the GPIO pin and other options, usually in your board
 	  setup.
 	  setup.
-
-endif

+ 2 - 1
drivers/pps/generators/Kconfig

@@ -3,10 +3,11 @@
 #
 #
 
 
 comment "PPS generators support"
 comment "PPS generators support"
+	depends on PPS
 
 
 config PPS_GENERATOR_PARPORT
 config PPS_GENERATOR_PARPORT
 	tristate "Parallel port PPS signal generator"
 	tristate "Parallel port PPS signal generator"
-	depends on PARPORT && BROKEN
+	depends on PPS && PARPORT && BROKEN
 	help
 	help
 	  If you say yes here you get support for a PPS signal generator which
 	  If you say yes here you get support for a PPS signal generator which
 	  utilizes STROBE pin of a parallel port to send PPS signals. It uses
 	  utilizes STROBE pin of a parallel port to send PPS signals. It uses