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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh4
/
perf_event.c
diff --git
a/arch/sh/kernel/cpu/sh4/perf_event.c
b/arch/sh/kernel/cpu/sh4/perf_event.c
index
7f9ecc9
..
dbf3b4b
100644
(file)
--- a/
arch/sh/kernel/cpu/sh4/perf_event.c
+++ b/
arch/sh/kernel/cpu/sh4/perf_event.c
@@
-225,7
+225,7
@@
static void sh7750_pmu_enable_all(void)
}
static struct sh_pmu sh7750_pmu = {
- .name = "
SH
7750",
+ .name = "
sh
7750",
.num_events = 2,
.event_map = sh7750_event_map,
.max_events = ARRAY_SIZE(sh7750_general_events),