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 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-realview
/
hotplug.c
diff --git
a/arch/arm/mach-realview/hotplug.c
b/arch/arm/mach-realview/hotplug.c
index
be048e3
..
f95521a
100644
(file)
--- a/
arch/arm/mach-realview/hotplug.c
+++ b/
arch/arm/mach-realview/hotplug.c
@@
-131,7
+131,7
@@
void platform_cpu_die(unsigned int cpu)
cpu_leave_lowpower();
}
-int
mach
_cpu_disable(unsigned int cpu)
+int
platform
_cpu_disable(unsigned int cpu)
{
/*
* we don't allow CPU 0 to be shutdown (it is still too special