diff --git a/[refs] b/[refs]
index ac5bc69d0c16..3e6d529d426a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f82e939fb75ad01da8f0d3024fc678111ddb4ac7
+refs/heads/master: 90be8c16950e28aee7cad422272805dcefa06167
diff --git a/trunk/arch/xtensa/kernel/time.c b/trunk/arch/xtensa/kernel/time.c
index 8df1e842f6d4..86bfe83718e9 100644
--- a/trunk/arch/xtensa/kernel/time.c
+++ b/trunk/arch/xtensa/kernel/time.c
@@ -37,15 +37,6 @@ unsigned long nsec_per_ccount;		/* nsec per ccount increment */
 
 static long last_rtc_update = 0;
 
-/*
- * Scheduler clock - returns current tim in nanosec units.
- */
-
-unsigned long long sched_clock(void)
-{
-	return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
 static irqreturn_t timer_interrupt(int irq, void *dev_id);
 static struct irqaction timer_irqaction = {
 	.handler =	timer_interrupt,