Merge with mainline to remove plat-omap/Kconfig conflict

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / plat-omap / include / plat / omap44xx.h

diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h
index 8fc15d33089a4eb00a201093f9c8120151ef8b23..2302474a374896c20849ba235c8f6d247cacdb42 100644 (file)
--- a/arch/arm/plat-omap/include/plat/omap44xx.h
+++ b/arch/arm/plat-omap/include/plat/omap44xx.h
@@ -40,6 +40,7 @@
 #define OMAP44XX_GIC_CPU_BASE          0x48240100
 #define OMAP44XX_SCU_BASE              0x48240000
 #define OMAP44XX_LOCAL_TWD_BASE                0x48240600
+#define OMAP44XX_L2CACHE_BASE          0x48242000
 #define OMAP44XX_WKUPGEN_BASE          0x48281000
 #define OMAP44XX_MCPDM_BASE            0x40132000
 #define OMAP44XX_MCPDM_L3_BASE         0x49032000