X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-omap%2Fomap24xx.h;h=2e944a159ec1abdb92b2f7b941fc038ddac23ed1;hb=ad1794683d378d08467ea9b340628994ff3e7edd;hp=e552ce8c5bfe6dd7ce73895b980660a86a3bf2ac;hpb=3c5639c67736e191ac380fc94fccaa347cfd964c;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index e552ce8c5bf..2e944a159ec 100644
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -41,9 +41,6 @@
 #define OMAP24XX_IVA_INTC_BASE	0x40000000
 #define IRQ_SIR_IRQ		0x0040
 
-#define OMAP24XX_CONTROL_DEVCONF	(L4_24XX_BASE + 0x274)
-#define OMAP24XX_CONTROL_STATUS	(L4_24XX_BASE + 0x2f8)
-
 #define OMAP2420_CTRL_BASE	L4_24XX_BASE
 #define OMAP2420_32KSYNCT_BASE	(L4_24XX_BASE + 0x4000)
 #define OMAP2420_PRCM_BASE	(L4_24XX_BASE + 0x8000)
@@ -106,5 +103,12 @@
 
 #endif
 
+/* Control module */
+#define OMAP2_CONTROL_DEVCONF0	(OMAP2_CTRL_BASE + 0x274)
+#define OMAP2_CONTROL_DEVCONF1	(OMAP2_CTRL_BASE + 0x2e8)
+#define OMAP2_CONTROL_DEVCONF   OMAP2_CONTROL_DEVCONF0
+
+#define OMAP2_CONTROL_STATUS	(OMAP2_CTRL_BASE + 0x2f8)
+
 #endif /* __ASM_ARCH_OMAP24XX_H */