Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / drivers / pps / Kconfig

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