summaryrefslogtreecommitdiff
path: root/board/ait
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-07-01 15:11:18 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-07-01 15:11:18 +0200
commite99f30e105a253ee64bef1ef83b86a47e0d3b6f1 (patch)
tree847e087ca50c1d0a02b750577b13af45aa498361 /board/ait
parentd6694aff569a0838a9d0ef352128f5aa309d73ff (diff)
parent12cc54376768461533b55ada1b0b6d4979f40579 (diff)
downloadu-boot-imx-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.zip
u-boot-imx-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.tar.gz
u-boot-imx-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.tar.bz2
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/ait')
-rw-r--r--board/ait/cam_enc_4xx/cam_enc_4xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/ait/cam_enc_4xx/cam_enc_4xx.c b/board/ait/cam_enc_4xx/cam_enc_4xx.c
index 9aa1d7a..290dc19 100644
--- a/board/ait/cam_enc_4xx/cam_enc_4xx.c
+++ b/board/ait/cam_enc_4xx/cam_enc_4xx.c
@@ -16,7 +16,7 @@
#include <netdev.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
-#include <asm/arch/nand_defs.h>
+#include <asm/ti-common/davinci_nand.h>
#include <asm/arch/davinci_misc.h>
#ifdef CONFIG_DAVINCI_MMC
#include <mmc.h>