git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release' and 'stats' into release
[sfrench/cifs-2.6.git]
/
arch
/
xtensa
/
kernel
/
time.c
diff --git
a/arch/xtensa/kernel/time.c
b/arch/xtensa/kernel/time.c
index 60d29fe0b1bdfd7dac917d5b6ad9f3114acc08e3..8df1e842f6d401d060d077246d97d942c2033cad 100644
(file)
--- a/
arch/xtensa/kernel/time.c
+++ b/
arch/xtensa/kernel/time.c
@@
-204,7
+204,7
@@
again:
}
#ifndef CONFIG_GENERIC_CALIBRATE_DELAY
-void __
dev
init calibrate_delay(void)
+void __
cpu
init calibrate_delay(void)
{
loops_per_jiffy = CCOUNT_PER_JIFFY;
printk("Calibrating delay loop (skipped)... "