diff options
| author | Stefan Roese <sr@denx.de> | 2007-12-11 11:34:54 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-12-11 11:34:54 +0100 |
| commit | 9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (patch) | |
| tree | 1afcc9c20c04e19870ab5e2996104877695c54a3 /lib_blackfin/board.c | |
| parent | 7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b (diff) | |
| parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff) | |
| download | u-boot-imx-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.zip u-boot-imx-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.gz u-boot-imx-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.bz2 | |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/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> |