git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
m32r
/
kernel
/
smpboot.c
diff --git
a/arch/m32r/kernel/smpboot.c
b/arch/m32r/kernel/smpboot.c
index
fa78656
..
48d376f
100644
(file)
--- a/
arch/m32r/kernel/smpboot.c
+++ b/
arch/m32r/kernel/smpboot.c
@@
-351,7
+351,7
@@
static void __init do_boot_cpu(int phys_id)
}
}
-int __
dev
init __cpu_up(unsigned int cpu_id)
+int __
cpu
init __cpu_up(unsigned int cpu_id)
{
int timeout;