git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_2.6.35' of git://git.pwsan.com/linux-2.6 into omap-for-linus
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-omap2
/
omap_hwmod_2420_data.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index
eb7ee24
..
e5530c5
100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/
arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@
-125,7
+125,7
@@
static struct omap_hwmod_ocp_if *omap2420_mpu_masters[] = {
/* MPU */
static struct omap_hwmod omap2420_mpu_hwmod = {
- .name = "mpu
_hwmod
",
+ .name = "mpu",
.class = &mpu_hwmod_class,
.main_clk = "mpu_ck",
.masters = omap2420_mpu_masters,