From fc495a818d32ba9fc18ba3fca2793d416c2c2cb9 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@mvista.com>
Date: Mon, 12 Nov 2007 23:24:04 -0800
Subject: [PATCH] --- yaml --- r: 91302 b: refs/heads/master c:
 dd89dd98cb9ae28f9e4c4d2c08be427a1f941c54 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/arch/arm/mach-omap1/time.c | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 3a700b53e1f4..2c1674088bb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caa97963a5d9042af15728bcd22ee5a8900dc0e9
+refs/heads/master: dd89dd98cb9ae28f9e4c4d2c08be427a1f941c54
diff --git a/trunk/arch/arm/mach-omap1/time.c b/trunk/arch/arm/mach-omap1/time.c
index f6cf2b7e52be..5d2b270935a2 100644
--- a/trunk/arch/arm/mach-omap1/time.c
+++ b/trunk/arch/arm/mach-omap1/time.c
@@ -227,22 +227,6 @@ static void __init omap_init_clocksource(unsigned long rate)
 		printk(err, clocksource_mpu.name);
 }
 
-
-/*
- * Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
-	unsigned long ticks = 0 - omap_mpu_timer_read(1);
-	unsigned long long ticks64;
-
-	ticks64 = omap_mpu_timer2_overflows;
-	ticks64 <<= 32;
-	ticks64 |= ticks;
-
-	return cycles_2_ns(ticks64);
-}
-
 /*
  * ---------------------------------------------------------------------------
  * Timer initialization