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/sage/ceph...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
power5+-pmu.c
diff --git
a/arch/powerpc/kernel/power5+-pmu.c
b/arch/powerpc/kernel/power5+-pmu.c
index
f58a2bd
..
a8757ba
100644
(file)
--- a/
arch/powerpc/kernel/power5+-pmu.c
+++ b/
arch/powerpc/kernel/power5+-pmu.c
@@
-677,7
+677,7
@@
static struct power_pmu power5p_pmu = {
.cache_events = &power5p_cache_events,
};
-static int init_power5p_pmu(void)
+static int
__init
init_power5p_pmu(void)
{
if (!cur_cpu_spec->oprofile_cpu_type ||
(strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+")