aboutsummaryrefslogtreecommitdiff
path: root/arch/m32r/kernel/time.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-02-12 23:52:26 -0600
committerKumar Gala <galak@kernel.crashing.org>2007-02-12 23:52:26 -0600
commit7baca6ad0ef09c8a78d798c93a3ce25336e8f50f (patch)
treef3dd43243be6e840dc2b0386e91c4146a4f51620 /arch/m32r/kernel/time.c
parent06d8bf64ba25db42fcc60d2da2268ac22af94e77 (diff)
parent17e0e27020d028a790d97699aff85a43af5be472 (diff)
Merge branch 'master' into for_paulus
Diffstat (limited to 'arch/m32r/kernel/time.c')
-rw-r--r--arch/m32r/kernel/time.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c
index a09038282c7..3858c9f39ba 100644
--- a/arch/m32r/kernel/time.c
+++ b/arch/m32r/kernel/time.c
@@ -286,11 +286,3 @@ void __init time_init(void)
#error no chip configuration
#endif
}
-
-/*
- * Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
- return (unsigned long long)jiffies * (1000000000 / HZ);
-}