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
[XFS] Fix merge failures
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
topology.c
diff --git
a/arch/sh/kernel/topology.c
b/arch/sh/kernel/topology.c
index
9b5844a
..
0838942
100644
(file)
--- a/
arch/sh/kernel/topology.c
+++ b/
arch/sh/kernel/topology.c
@@
-29,7
+29,7
@@
static int __init topology_init(void)
ret = register_cpu(&per_cpu(cpu_devices, i), i);
if (unlikely(ret))
printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
- __
FUNCTION
__, i, ret);
+ __
func
__, i, ret);
}
#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)