diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 17:21:34 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 17:21:34 +0100 |
commit | 8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (patch) | |
tree | 48716af89f175c89a9be2247f77e13099980e43f /arch/arm/plat-omap/include/mach/omap24xx.h | |
parent | 5a07055a3849574f4fbe5d0ce7cd2d26ab9a37c1 (diff) | |
parent | 2e7509e5b3acc4b8653faa1966e5ac234d36ac82 (diff) | |
download | talos-obmc-linux-8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f.tar.gz talos-obmc-linux-8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f.zip |
Merge branch 'omap2-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/plat-omap/include/mach/omap24xx.h')
-rw-r--r-- | arch/arm/plat-omap/include/mach/omap24xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/omap24xx.h b/arch/arm/plat-omap/include/mach/omap24xx.h index bb8319d66e9f..556f0eb4d55c 100644 --- a/arch/arm/plat-omap/include/mach/omap24xx.h +++ b/arch/arm/plat-omap/include/mach/omap24xx.h @@ -48,6 +48,7 @@ #define OMAP2420_PRM_BASE OMAP2420_CM_BASE #define OMAP2420_SDRC_BASE (L3_24XX_BASE + 0x9000) #define OMAP2420_SMS_BASE 0x68008000 +#define OMAP2420_GPMC_BASE 0x6800a000 #define OMAP2430_32KSYNCT_BASE (L4_WK_243X_BASE + 0x20000) #define OMAP2430_PRCM_BASE (L4_WK_243X_BASE + 0x6000) |