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
/
ait
/
cam_enc_4xx
/
cam_enc_4xx.c
diff --git
a/board/ait/cam_enc_4xx/cam_enc_4xx.c
b/board/ait/cam_enc_4xx/cam_enc_4xx.c
index 9aa1d7aece41f56fa1451f18e23274b9a84eaeba..290dc1984ab3a9508e2dc3a2b6c0e393838691c3 100644
(file)
--- a/
board/ait/cam_enc_4xx/cam_enc_4xx.c
+++ b/
board/ait/cam_enc_4xx/cam_enc_4xx.c
@@
-16,7
+16,7
@@
#include <netdev.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
-#include <asm/
arch/nand_defs
.h>
+#include <asm/
ti-common/davinci_nand
.h>
#include <asm/arch/davinci_misc.h>
#ifdef CONFIG_DAVINCI_MMC
#include <mmc.h>