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 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
topology.c
diff --git
a/arch/ia64/kernel/topology.c
b/arch/ia64/kernel/topology.c
index
0baa1bb
..
0e0e0cc
100644
(file)
--- a/
arch/ia64/kernel/topology.c
+++ b/
arch/ia64/kernel/topology.c
@@
-43,7
+43,7
@@
int __ref arch_register_cpu(int num)
{
#ifdef CONFIG_ACPI
/*
- * If CPEI can be re-target
t
ed or if this is not
+ * If CPEI can be re-targeted or if this is not
* CPEI target, then it is hotpluggable
*/
if (can_cpei_retarget() || !is_cpu_cpei_target(num))