diff options
| author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
|---|---|---|
| committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
| commit | 521dcd30b9cc5b72cd27ae04104f19369251aa20 (patch) | |
| tree | bc33710a3ae6f97f0dcae8f02fd6f3c91322d96d /lib_blackfin/board.c | |
| parent | 260eea5676ca46903a335686cc020b29c4ca46fe (diff) | |
| parent | 8d4f040a3c15036a6ea25a9c39e7d89fefa8440d (diff) | |
| download | u-boot-imx-521dcd30b9cc5b72cd27ae04104f19369251aa20.zip u-boot-imx-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.gz u-boot-imx-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
Diffstat (limited to 'lib_blackfin/board.c')
| -rw-r--r-- | lib_blackfin/board.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index 7c9990f..86a3b67 100644 --- a/lib_blackfin/board.c +++ b/lib_blackfin/board.c @@ -35,7 +35,7 @@ #include <i2c.h> #include "blackfin_board.h" #include <asm/cplb.h> -#include "../drivers/smc91111.h" +#include "../drivers/net/smc91111.h" #if defined(CONFIG_BF537)&&defined(CONFIG_POST) #include <post.h> |