diff --git a/[refs] b/[refs]
index b0363d469d89..80bbab9e3116 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5bfece2d6129131b4ade985e63bc35ddf5868d4
+refs/heads/master: 5b533f4ff5b6d8f2442f2ac82ca1530ff3f55267
diff --git a/trunk/kernel/time/Kconfig b/trunk/kernel/time/Kconfig
index 4a17b5069466..3b683227a10d 100644
--- a/trunk/kernel/time/Kconfig
+++ b/trunk/kernel/time/Kconfig
@@ -79,7 +79,7 @@ choice
 	prompt "Timer tick handling"
 	default NO_HZ_IDLE if NO_HZ
 
-config PERIODIC_HZ
+config HZ_PERIODIC
 	bool "Periodic timer ticks (constant rate, no dynticks)"
 	help
 	  This option keeps the tick running periodically at a constant