diff options
| author | Stefan Roese <sr@denx.de> | 2007-12-11 10:34:54 (GMT) |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-12-11 10:34:54 (GMT) |
| commit | 9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (patch) | |
| tree | 1afcc9c20c04e19870ab5e2996104877695c54a3 /lib_arm/board.c | |
| parent | 7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b (diff) | |
| parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff) | |
| download | u-boot-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.xz | |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/Makefile
Diffstat (limited to 'lib_arm/board.c')
| -rw-r--r-- | lib_arm/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 7e97f13..6f35aa0 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -46,10 +46,10 @@ #include <net.h> #ifdef CONFIG_DRIVER_SMC91111 -#include "../drivers/smc91111.h" +#include "../drivers/net/smc91111.h" #endif #ifdef CONFIG_DRIVER_LAN91C96 -#include "../drivers/lan91c96.h" +#include "../drivers/net/lan91c96.h" #endif DECLARE_GLOBAL_DATA_PTR; |