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/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
time.c
diff --git
a/arch/arm/mach-pxa/time.c
b/arch/arm/mach-pxa/time.c
index
ee2beb4
..
fc3b82a
100644
(file)
--- a/
arch/arm/mach-pxa/time.c
+++ b/
arch/arm/mach-pxa/time.c
@@
-112,7
+112,7
@@
static struct clocksource clocksource_pxa = {
.read = pxa_get_cycles,
.mask = CLOCKSOURCE_MASK(32),
.shift = 20,
- .
is_continuous = 1
,
+ .
flags = CLOCK_SOURCE_IS_CONTINUOUS
,
};
static void __init pxa_timer_init(void)