projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
board
/
Barix
/
ipam390
/
ipam390.c
diff --git
a/board/Barix/ipam390/ipam390.c
b/board/Barix/ipam390/ipam390.c
index ae88b4230a2deb384152c8edb36c8e22835a61a3..6ce8960bbd647ca030dae6c0cd18966eb549ef2c 100644
(file)
--- a/
board/Barix/ipam390/ipam390.c
+++ b/
board/Barix/ipam390/ipam390.c
@@
-20,7
+20,7
@@
#include <spi.h>
#include <spi_flash.h>
#include <asm/arch/hardware.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/io.h>