Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/arm/mach-mmp/time.c |   19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

Index: linux-2.6-tip/arch/arm/mach-mmp/time.c
===================================================================
--- linux-2.6-tip.orig/arch/arm/mach-mmp/time.c
+++ linux-2.6-tip/arch/arm/mach-mmp/time.c
@@ -27,7 +27,6 @@
 #include <linux/irq.h>
 #include <linux/sched.h>
 
-#include <asm/sched_clock.h>
 #include <mach/addr-map.h>
 #include <mach/regs-timers.h>
 #include <mach/regs-apbc.h>
@@ -42,12 +41,10 @@
 #define MAX_DELTA		(0xfffffffe)
 #define MIN_DELTA		(16)
 
-static DEFINE_CLOCK_DATA(cd);
-
 /*
  * FIXME: the timer needs some delay to stablize the counter capture
  */
-static inline uint32_t timer_read(void)
+static inline uint32_t notrace timer_read(void)
 {
 	int delay = 100;
 
@@ -59,18 +56,6 @@ static inline uint32_t timer_read(void)
 	return __raw_readl(TIMERS_VIRT_BASE + TMR_CVWR(0));
 }
 
-unsigned long long notrace sched_clock(void)
-{
-	u32 cyc = timer_read();
-	return cyc_to_sched_clock(&cd, cyc, (u32)~0);
-}
-
-static void notrace mmp_update_sched_clock(void)
-{
-	u32 cyc = timer_read();
-	update_sched_clock(&cd, cyc, (u32)~0);
-}
-
 static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
 	struct clock_event_device *c = dev_id;
@@ -175,8 +160,6 @@ void __init timer_init(int irq)
 {
 	timer_config();
 
-	init_sched_clock(&cd, mmp_update_sched_clock, 32, CLOCK_TICK_RATE);
-
 	ckevt.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, ckevt.shift);
 	ckevt.max_delta_ns = clockevent_delta2ns(MAX_DELTA, &ckevt);
 	ckevt.min_delta_ns = clockevent_delta2ns(MIN_DELTA, &ckevt);