Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / pps / Kconfig

diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
index 1afe4e03440f648c2c30144416a1d15d6fb2a37d..f0d3376b58ba1710a7dbc7ab45cd89ca79e87041 100644 (file)
--- a/drivers/pps/Kconfig
+++ b/drivers/pps/Kconfig
@@ -30,6 +30,17 @@ config PPS_DEBUG
          messages to the system log.  Select this if you are having a
          problem with PPS support and want to see more of what is going on.
 
+config NTP_PPS
+       bool "PPS kernel consumer support"
+       depends on PPS && !NO_HZ
+       help
+         This option adds support for direct in-kernel time
+         syncronization using an external PPS signal.
+
+         It doesn't work on tickless systems at the moment.
+
 source drivers/pps/clients/Kconfig
 
+source drivers/pps/generators/Kconfig
+
 endmenu