diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:11:18 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:11:18 +0200 |
| commit | e99f30e105a253ee64bef1ef83b86a47e0d3b6f1 (patch) | |
| tree | 847e087ca50c1d0a02b750577b13af45aa498361 /board/ait | |
| parent | d6694aff569a0838a9d0ef352128f5aa309d73ff (diff) | |
| parent | 12cc54376768461533b55ada1b0b6d4979f40579 (diff) | |
| download | blackbird-obmc-uboot-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.tar.gz blackbird-obmc-uboot-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.zip | |
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.c | 2 |
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 9aa1d7aece..290dc1984a 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> |
