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 tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[pandora-kernel.git]
/
arch
/
arm
/
mach-realview
/
realview_pbx.c
diff --git
a/arch/arm/mach-realview/realview_pbx.c
b/arch/arm/mach-realview/realview_pbx.c
index
d89eb40
..
9a22b86
100644
(file)
--- a/
arch/arm/mach-realview/realview_pbx.c
+++ b/
arch/arm/mach-realview/realview_pbx.c
@@
-280,7
+280,7
@@
static struct resource pmu_resources[] = {
};
static struct platform_device pmu_device = {
- .name = "arm-pmu",
+ .name = "arm
v7
-pmu",
.id = -1,
.num_resources = ARRAY_SIZE(pmu_resources),
.resource = pmu_resources,