From fa3fbf6572dd4966eeb5f5f5e09d65327b6c0ba1 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 2 Jan 2011 15:05:21 +0000
Subject: [PATCH] --- yaml --- r: 225899 b: refs/heads/master c:
 15095bb0fe779c0403091bda7adce5fb3bb9ca35 h: refs/heads/master i:   225897:
 db61b5b25409cc6c6b13d49d43c07c6ce96369b8   225895:
 42fb3bd9b03cad823ae7296e24de8cedd919e813 v: v3

---
 [refs]                 | 2 +-
 trunk/arch/arm/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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