summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/common.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-12-11 16:16:02 -0800
committerTony Lindgren <tony@atomide.com>2009-12-11 16:16:02 -0800
commit24ed45aa0776f9f645aa1ac1a88b2e1d5f29a9aa (patch)
tree6fdca6b205015558663dcfa523f87d6c6ffa7afa /arch/arm/plat-omap/common.c
parentaa2cf420593b67cc93de7a3f675b2a88eba0505f (diff)
parent911bd7395c4aa4e74b13aab790ca1500c59fae02 (diff)
Merge branch 'for_2_6_33' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/common.c')
-rw-r--r--arch/arm/plat-omap/common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index cc050b3313b..01ab1e56db1 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -284,12 +284,14 @@ static struct omap_globals omap4_globals = {
.ctrl = OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
.prm = OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
.cm = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
+ .cm2 = OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE),
};
void __init omap2_set_globals_443x(void)
{
omap2_set_globals_tap(&omap4_globals);
omap2_set_globals_control(&omap4_globals);
+ omap2_set_globals_prcm(&omap4_globals);
}
#endif