summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/am33xx/board.c
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-08 12:15:45 (GMT)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-08 12:15:45 (GMT)
commit79f38777947ac7685e2cef8bd977f954ab198c0e (patch)
tree6fe053ef751b1c424ec50be338844197b6421d74 /arch/arm/cpu/armv7/am33xx/board.c
parent96764df1b47ddebfb50fadf5af72530b07b5fc89 (diff)
parent9bd5c1ad0db802c9f8d49d72b443f03431cf6a89 (diff)
downloadu-boot-79f38777947ac7685e2cef8bd977f954ab198c0e.tar.xz
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
This required manual merging drivers/mtd/nand/Makefile and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx/board.c')
-rw-r--r--arch/arm/cpu/armv7/am33xx/board.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c
index da5bc73..ab31326 100644
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -25,6 +25,7 @@
#include <asm/arch/ddr_defs.h>
#include <asm/arch/clock.h>
#include <asm/arch/gpio.h>
+#include <asm/arch/mem.h>
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/sys_proto.h>
#include <asm/io.h>