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>

diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
index 564a51abeecec3a313e94ffdc1a4e9e0900682bf..4b29a7182d7bafd8fc0de8630c60e83bcb07af9c 100644 (file)
--- a/drivers/pps/Kconfig
+++ b/drivers/pps/Kconfig
@@ -2,9 +2,7 @@
 # PPS support configuration
 #
 
-menu "PPS support"
-
-config PPS
+menuconfig PPS
        tristate "PPS support"
        ---help---
          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
          will be called pps_core.ko.
-if PPS
 
 config PPS_DEBUG
        bool "PPS debugging messages"
+       depends on PPS
        help
          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
@@ -31,17 +29,13 @@ config PPS_DEBUG
 
 config NTP_PPS
        bool "PPS kernel consumer support"
-       depends on !NO_HZ_COMMON
+       depends on PPS && !NO_HZ_COMMON
        help
          This option adds support for direct in-kernel time
          synchronization using an external PPS signal.
 
          It doesn't work on tickless systems at the moment.
 
-endif
-
 source drivers/pps/clients/Kconfig
 
 source drivers/pps/generators/Kconfig
-
-endmenu

diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
index 0c9f2805d076ee9633087fc246018c5758b71257..efec021ce662d8b9bb487376108a4c309011c483 100644 (file)
--- a/drivers/pps/clients/Kconfig
+++ b/drivers/pps/clients/Kconfig
@@ -2,12 +2,12 @@
 # PPS clients configuration
 #
 
-if PPS
-
 comment "PPS clients support"
+       depends on PPS
 
 config PPS_CLIENT_KTIMER
        tristate "Kernel timer client (Testing client, use for debug)"
+       depends on PPS
        help
          If you say yes here you get support for a PPS debugging client
          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
          specifying the GPIO pin and other options, usually in your board
          setup.
-
-endif

diff --git a/drivers/pps/generators/Kconfig b/drivers/pps/generators/Kconfig
index e4c4f3dc0728fc5c495b2283d08c180210a29379..86b59378e71fc85b2b3c8926df36981a7567e99d 100644 (file)
--- a/drivers/pps/generators/Kconfig
+++ b/drivers/pps/generators/Kconfig
@@ -3,10 +3,11 @@
 #
 
 comment "PPS generators support"
+       depends on PPS
 
 config PPS_GENERATOR_PARPORT
        tristate "Parallel port PPS signal generator"
-       depends on PARPORT && BROKEN
+       depends on PPS && PARPORT && BROKEN
        help
          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