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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
ppc970-pmu.c
diff --git
a/arch/powerpc/kernel/ppc970-pmu.c
b/arch/powerpc/kernel/ppc970-pmu.c
index
b121de9
..
8c21902
100644
(file)
--- a/
arch/powerpc/kernel/ppc970-pmu.c
+++ b/
arch/powerpc/kernel/ppc970-pmu.c
@@
-489,7
+489,7
@@
static struct power_pmu ppc970_pmu = {
.cache_events = &ppc970_cache_events,
};
.cache_events = &ppc970_cache_events,
};
-static int init_ppc970_pmu(void)
+static int
__init
init_ppc970_pmu(void)
{
if (!cur_cpu_spec->oprofile_cpu_type ||
(strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970")
{
if (!cur_cpu_spec->oprofile_cpu_type ||
(strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970")