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/enbw | |
| parent | d6694aff569a0838a9d0ef352128f5aa309d73ff (diff) | |
| parent | 12cc54376768461533b55ada1b0b6d4979f40579 (diff) | |
| download | u-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/enbw')
| -rw-r--r-- | board/enbw/enbw_cmc/enbw_cmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/enbw/enbw_cmc/enbw_cmc.c b/board/enbw/enbw_cmc/enbw_cmc.c index 39efe20..53b8362 100644 --- a/board/enbw/enbw_cmc/enbw_cmc.c +++ b/board/enbw/enbw_cmc/enbw_cmc.c @@ -29,7 +29,7 @@ #include <asm/io.h> #include <asm/arch/da850_lowlevel.h> #include <asm/arch/davinci_misc.h> -#include <asm/arch/emif_defs.h> +#include <asm/ti-common/davinci_nand.h> #include <asm/arch/emac_defs.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux_defs.h> |