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 branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
arch
/
avr32
/
kernel
/
time.c
diff --git
a/arch/avr32/kernel/time.c
b/arch/avr32/kernel/time.c
index
5a247ba
..
c10833f
100644
(file)
--- a/
arch/avr32/kernel/time.c
+++ b/
arch/avr32/kernel/time.c
@@
-37,7
+37,7
@@
static struct clocksource clocksource_avr32 = {
.read = read_cycle_count,
.mask = CLOCKSOURCE_MASK(32),
.shift = 16,
.read = read_cycle_count,
.mask = CLOCKSOURCE_MASK(32),
.shift = 16,
- .
is_continuous = 1
,
+ .
flags = CLOCK_SOURCE_IS_CONTINUOUS
,
};
/*
};
/*
@@
-109,15
+109,6
@@
static void avr32_hpt_init(unsigned int count)
sysreg_write(COUNT, count);
}
sysreg_write(COUNT, count);
}
-/*
- * Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
- /* There must be better ways...? */
- return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
/*
* local_timer_interrupt() does profiling and process accounting on a
* per-CPU basis.
/*
* local_timer_interrupt() does profiling and process accounting on a
* per-CPU basis.