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 /drivers/mtd | |
| parent | d6694aff569a0838a9d0ef352128f5aa309d73ff (diff) | |
| parent | 12cc54376768461533b55ada1b0b6d4979f40579 (diff) | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/davinci_nand.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 75b03a74b6..5d425092f4 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -32,8 +32,7 @@ #include <common.h> #include <asm/io.h> #include <nand.h> -#include <asm/arch/nand_defs.h> -#include <asm/arch/emif_defs.h> +#include <asm/ti-common/davinci_nand.h> /* Definitions for 4-bit hardware ECC */ #define NAND_TIMEOUT 10240 |