commit 4e93ae1967218847dffa4b586b83579abf142860
author Jeff Ohlstein <johlstei@codeaurora.org> Mon Sep 26 18:22:26 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Tue Oct 04 17:13:54 2011 -0700
tree 48c278f03136fbc7f22c1793c27b80fe2cdc7604
parent 0275dcb0111bdb19643e89916eb521b2bdea2e9a

Revert "Revert "msm: timer: Use generic sched_clock interface""

This reverts commit 3365cbf5fa742f4bb11fbae59a5e151b63abead7.

CRs-Fixed: 308893
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>

Conflicts:

	arch/arm/Kconfig
	arch/arm/mach-msm/timer.c

arch/arm/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4111f91..5fbc034 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -631,6 +631,7 @@
 	select GENERIC_GPIO
 	select GENERIC_TIME
 	select GENERIC_ALLOCATOR
+	select HAVE_SCHED_CLOCK
 	help
 	  Support for Qualcomm MSM/QSD based systems.  This runs on the
 	  apps processor of the MSM/QSD and depends on a shared memory