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 ../linux-2.6-watchdog-mm
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
smp.c
diff --git
a/arch/cris/arch-v32/kernel/smp.c
b/arch/cris/arch-v32/kernel/smp.c
index
2d0023f
..
77e655f
100644
(file)
--- a/
arch/cris/arch-v32/kernel/smp.c
+++ b/
arch/cris/arch-v32/kernel/smp.c
@@
-195,7
+195,7
@@
int setup_profiling_timer(unsigned int multiplier)
*/
unsigned long cache_decay_ticks = 1;
-int __
dev
init __cpu_up(unsigned int cpu)
+int __
cpu
init __cpu_up(unsigned int cpu)
{
smp_boot_one_cpu(cpu);
return cpu_online(cpu) ? 0 : -ENOSYS;