summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/cm.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-08-18 23:37:37 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2009-08-18 23:37:37 +0200
commitaf15c1addf920d830b030e3489a482456904ca8c (patch)
treedc4adab63d19507f7ac44855ad9920f8fd2dd2f0 /arch/arm/mach-omap2/cm.h
parente6f25a7b2398581a5f96bf9021d0b22c9647acf4 (diff)
parentdcd94dbdaff452b95d4ba11fdbf853b5bda8e6e7 (diff)
downloadop-kernel-dev-af15c1addf920d830b030e3489a482456904ca8c.zip
op-kernel-dev-af15c1addf920d830b030e3489a482456904ca8c.tar.gz
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/mach-omap2/cm.h')
-rw-r--r--arch/arm/mach-omap2/cm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h
index 1d3c93b..f3c91a1 100644
--- a/arch/arm/mach-omap2/cm.h
+++ b/arch/arm/mach-omap2/cm.h
@@ -29,9 +29,9 @@
* These registers appear once per CM module.
*/
-#define OMAP3430_CM_REVISION OMAP_CM_REGADDR(OCP_MOD, 0x0000)
-#define OMAP3430_CM_SYSCONFIG OMAP_CM_REGADDR(OCP_MOD, 0x0010)
-#define OMAP3430_CM_POLCTRL OMAP_CM_REGADDR(OCP_MOD, 0x009c)
+#define OMAP3430_CM_REVISION OMAP34XX_CM_REGADDR(OCP_MOD, 0x0000)
+#define OMAP3430_CM_SYSCONFIG OMAP34XX_CM_REGADDR(OCP_MOD, 0x0010)
+#define OMAP3430_CM_POLCTRL OMAP34XX_CM_REGADDR(OCP_MOD, 0x009c)
#define OMAP3_CM_CLKOUT_CTRL_OFFSET 0x0070
#define OMAP3430_CM_CLKOUT_CTRL OMAP_CM_REGADDR(OMAP3430_CCR_MOD, 0x0070)
OpenPOWER on IntegriCloud