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
/
plat-iop
/
pmu.c
diff --git
a/arch/arm/plat-iop/pmu.c
b/arch/arm/plat-iop/pmu.c
index
ad9f974
..
c6d979a
100644
(file)
--- a/
arch/arm/plat-iop/pmu.c
+++ b/
arch/arm/plat-iop/pmu.c
@@
-24,7
+24,7
@@
static struct resource pmu_resource = {
};
static struct platform_device pmu_device = {
- .name = "
arm
-pmu",
+ .name = "
xscale
-pmu",
.id = -1,
.resource = &pmu_resource,
.num_resources = 1,