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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
smp.h
diff --git
a/arch/arm/include/asm/smp.h
b/arch/arm/include/asm/smp.h
index
e0d763b
..
3d05190
100644
(file)
--- a/
arch/arm/include/asm/smp.h
+++ b/
arch/arm/include/asm/smp.h
@@
-82,7
+82,7
@@
struct secondary_data {
extern struct secondary_data secondary_data;
extern int __cpu_disable(void);
extern struct secondary_data secondary_data;
extern int __cpu_disable(void);
-extern int
mach
_cpu_disable(unsigned int cpu);
+extern int
platform
_cpu_disable(unsigned int cpu);
extern void __cpu_die(unsigned int cpu);
extern void cpu_die(void);
extern void __cpu_die(unsigned int cpu);
extern void cpu_die(void);