---

yaml --- r: 217001 b: refs/heads/master c: 54164bb h: refs/heads/master i: 216999: be9b910 v: v3
git-mirror · Oct 8, 2010 · 100f021 · 100f021
1 parent 3294191
commit 100f021
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6515e48932c8bf04227f9dd638c8ac634f89ba24
+refs/heads/master: 54164bb2927edd9f183a108a0d037d80639c8429
diff --git a/trunk/arch/arm/plat-omap/common.c b/trunk/arch/arm/plat-omap/common.c
@@ -268,7 +268,7 @@ static struct omap_globals omap242x_globals = {
 	.tap	= OMAP2_L4_IO_ADDRESS(0x48014000),
 	.sdrc	= OMAP2420_SDRC_BASE,
 	.sms	= OMAP2420_SMS_BASE,
-	.ctrl	= OMAP2420_CTRL_BASE,
+	.ctrl	= OMAP242X_CTRL_BASE,
 	.prm	= OMAP2420_PRM_BASE,
 	.cm	= OMAP2420_CM_BASE,
 };

diff --git a/trunk/arch/arm/plat-omap/include/plat/omap24xx.h b/trunk/arch/arm/plat-omap/include/plat/omap24xx.h
@@ -40,7 +40,7 @@
 #define OMAP24XX_IC_BASE	(L4_24XX_BASE + 0xfe000)
 #define OMAP24XX_IVA_INTC_BASE	0x40000000
 
-#define OMAP2420_CTRL_BASE	L4_24XX_BASE
+#define OMAP242X_CTRL_BASE	L4_24XX_BASE
 #define OMAP2420_32KSYNCT_BASE	(L4_24XX_BASE + 0x4000)
 #define OMAP2420_PRCM_BASE	(L4_24XX_BASE + 0x8000)
 #define OMAP2420_CM_BASE	(L4_24XX_BASE + 0x8000)