diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 13:11:18 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 13:11:18 (GMT) |
| commit | e99f30e105a253ee64bef1ef83b86a47e0d3b6f1 (patch) | |
| tree | 847e087ca50c1d0a02b750577b13af45aa498361 /board/davinci/dm355evm | |
| parent | d6694aff569a0838a9d0ef352128f5aa309d73ff (diff) | |
| parent | 12cc54376768461533b55ada1b0b6d4979f40579 (diff) | |
| download | u-boot-fsl-qoriq-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.tar.xz | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/davinci/dm355evm')
| -rw-r--r-- | board/davinci/dm355evm/dm355evm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/board/davinci/dm355evm/dm355evm.c b/board/davinci/dm355evm/dm355evm.c index 10422b2..e5a958f 100644 --- a/board/davinci/dm355evm/dm355evm.c +++ b/board/davinci/dm355evm/dm355evm.c @@ -8,8 +8,7 @@ #include <nand.h> #include <asm/io.h> #include <asm/arch/hardware.h> -#include <asm/arch/emif_defs.h> -#include <asm/arch/nand_defs.h> +#include <asm/ti-common/davinci_nand.h> #include <asm/arch/davinci_misc.h> #include <net.h> #include <netdev.h> |