projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-omap5
/
hardware.h
diff --git
a/arch/arm/include/asm/arch-omap5/hardware.h
b/arch/arm/include/asm/arch-omap5/hardware.h
index a5bd600092891515e584ed2301595ff16b0a4037..d24d6458cc877f8d4750290df7538a5545aeebcd 100644
(file)
--- a/
arch/arm/include/asm/arch-omap5/hardware.h
+++ b/
arch/arm/include/asm/arch-omap5/hardware.h
@@
-24,7
+24,7
@@
#define GPMC_BASE 0x50000000
/* EDMA3 Base address for DRA7XX and AM57XX */
-#if defined(CONFIG_DRA7XX)
|| defined(CONFIG_AM57XX)
+#if defined(CONFIG_DRA7XX)
#define EDMA3_BASE 0x43300000
#endif