git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
arch
/
sh64
/
kernel
/
time.c
diff --git
a/arch/sh64/kernel/time.c
b/arch/sh64/kernel/time.c
index
9c4a38a
..
390b40d
100644
(file)
--- a/
arch/sh64/kernel/time.c
+++ b/
arch/sh64/kernel/time.c
@@
-579,12
+579,3
@@
void enter_deep_standby(void)
asm __volatile__ ("nop");
panic("Unexpected wakeup!\n");
}
-
-/*
- * Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
- return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-