Merge branch 'for-tony-mailbox'

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / omap34xx.h

diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h
index f54dc0b86cc3771b2bee5dca5026069bc49cf711..2f82e28eda0914450f3a00df11d699859a9afe0d 100644 (file)
--- a/arch/arm/plat-omap/include/mach/omap34xx.h
+++ b/arch/arm/plat-omap/include/mach/omap34xx.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-omap/omap34xx.h
+ * arch/arm/plat-omap/include/mach/omap34xx.h
  *
  * This file contains the processor specific definitions of the TI OMAP34XX.
  *
@@ -63,6 +63,8 @@
 #define OMAP2_CM_BASE                  OMAP3430_CM_BASE
 #define OMAP2_PRM_BASE                 OMAP3430_PRM_BASE
 #define OMAP2_VA_IC_BASE               IO_ADDRESS(OMAP34XX_IC_BASE)
+#define OMAP34XX_CAMERA_BASE           (L4_34XX_BASE + 0xBC000)
+#define OMAP34XX_MAILBOX_BASE          (L4_34XX_BASE + 0x94000)
 
 #endif