diff --git a/[refs] b/[refs]
index dbee28d7c15b..1caf2b130f5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78368c79944b12f91bcacb0b0b030c36016264e8
+refs/heads/master: 15095bb0fe779c0403091bda7adce5fb3bb9ca35
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 290a4b57617f..15a177573b74 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1248,6 +1248,7 @@ config HAVE_ARM_SCU
 config HAVE_ARM_TWD
 	bool
 	depends on SMP
+	select TICK_ONESHOT
 	help
 	  This options enables support for the ARM timer and watchdog unit