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-pxa
/
devices.c
diff --git
a/arch/arm/mach-pxa/devices.c
b/arch/arm/mach-pxa/devices.c
index
ac7b3ea
..
3543466
100644
(file)
--- a/
arch/arm/mach-pxa/devices.c
+++ b/
arch/arm/mach-pxa/devices.c
@@
-40,7
+40,7
@@
static struct resource pxa_resource_pmu = {
};
struct platform_device pxa_device_pmu = {
- .name = "
arm
-pmu",
+ .name = "
xscale
-pmu",
.id = -1,
.resource = &pxa_resource_pmu,
.num_resources = 1,