summaryrefslogtreecommitdiff
path: root/board/omicron/calimain/calimain.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-07-02 20:38:02 (GMT)
committerTom Rini <trini@ti.com>2014-07-02 20:38:02 (GMT)
commitfe8b3212b7938861eacdefe6115810303a96f9cc (patch)
tree281508c9caa5a969597a4dff58d3027337b8759c /board/omicron/calimain/calimain.c
parenta176ff0705351bf6d993a8f15e081bfa2ba2e1af (diff)
parent304f936aeaab0c3cc9d5af438fd3498ac7682991 (diff)
downloadu-boot-fe8b3212b7938861eacdefe6115810303a96f9cc.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/omicron/calimain/calimain.c')
-rw-r--r--board/omicron/calimain/calimain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/omicron/calimain/calimain.c b/board/omicron/calimain/calimain.c
index dd28915..32f2b20 100644
--- a/board/omicron/calimain/calimain.c
+++ b/board/omicron/calimain/calimain.c
@@ -18,7 +18,7 @@
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/gpio.h>
-#include <asm/arch/emif_defs.h>
+#include <asm/ti-common/davinci_nand.h>
#include <asm/arch/emac_defs.h>
#include <asm/arch/pinmux_defs.h>
#include <asm/arch/davinci_misc.h>