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 /board/mpl/vcma9/cmd_vcma9.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 'board/mpl/vcma9/cmd_vcma9.c')
| -rw-r--r-- | board/mpl/vcma9/cmd_vcma9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c index 227c492..90a1b08 100644 --- a/board/mpl/vcma9/cmd_vcma9.c +++ b/board/mpl/vcma9/cmd_vcma9.c @@ -31,7 +31,7 @@ #include "../common/common_util.h" #if defined(CONFIG_DRIVER_CS8900) -#include <../drivers/cs8900.h> +#include <../drivers/net/cs8900.h> static uchar cs8900_chksum(ushort data) { |