diff options
author | Wolfgang Denk <wd@denx.de> | 2010-07-16 23:24:38 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-07-16 23:24:38 +0200 |
commit | e9aecdec153ae166739858e6a570432449b979f7 (patch) | |
tree | d773cbefa6696a83d572609ed0ee21c8d14174b2 /arch/arm/include/asm/arch-omap4/omap4.h | |
parent | b6c208ab1ebc2ac01e0029b8456210617ff67156 (diff) | |
parent | 27952014c465eec646157d5d045c084b94e3f2d7 (diff) | |
download | u-boot-imx-e9aecdec153ae166739858e6a570432449b979f7.zip u-boot-imx-e9aecdec153ae166739858e6a570432449b979f7.tar.gz u-boot-imx-e9aecdec153ae166739858e6a570432449b979f7.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'arch/arm/include/asm/arch-omap4/omap4.h')
-rw-r--r-- | arch/arm/include/asm/arch-omap4/omap4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-omap4/omap4.h b/arch/arm/include/asm/arch-omap4/omap4.h index d123d6a..5243ea8 100644 --- a/arch/arm/include/asm/arch-omap4/omap4.h +++ b/arch/arm/include/asm/arch-omap4/omap4.h @@ -62,7 +62,7 @@ #define SYNC_32KTIMER_BASE (OMAP44XX_L4_WKUP_BASE + 0x4000) /* GPMC */ -#define GPMC_BASE 0x50000000 +#define OMAP44XX_GPMC_BASE 0x50000000 /* * Hardware Register Details |