diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-04 15:33:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-04 15:33:22 -0800 |
| commit | 5958eed76ccc8c361f872829bdc4b8c6dc9cd379 (patch) | |
| tree | 8f8dfcced082db674b0ae3ca3af9fdb6dde59dae /arch/blackfin/kernel/time.c | |
| parent | c7c17c2779075e675cb3c7fe2ecde67e226771fb (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
| download | linux-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.tar.gz linux-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.tar.bz2 linux-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/blackfin/kernel/time.c')
| -rw-r--r-- | arch/blackfin/kernel/time.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c index bd3b53da295e..13c1ee3e6408 100644 --- a/arch/blackfin/kernel/time.c +++ b/arch/blackfin/kernel/time.c @@ -184,11 +184,3 @@ void __init time_init(void) time_sched_init(timer_interrupt); } - -/* - * Scheduler clock - returns current time in nanosec units. - */ -unsigned long long sched_clock(void) -{ - return (unsigned long long)jiffies *(NSEC_PER_SEC / HZ); -} |