diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-22 21:16:17 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-22 21:16:17 +0100 |
| commit | cdc51c294ad33879c4e57edf4c9d2155381b1d59 (patch) | |
| tree | fc1c3f2c23a2507e91358a6a6dfa881965bf603f /board/davinci/da8xxevm/da830evm.c | |
| parent | 250ef029844be2cb98635f265359396866d1749f (diff) | |
| parent | b8339e2b9f32663411dba0f48e25b23f542d53bc (diff) | |
| download | blackbird-obmc-uboot-cdc51c294ad33879c4e57edf4c9d2155381b1d59.tar.gz blackbird-obmc-uboot-cdc51c294ad33879c4e57edf4c9d2155381b1d59.zip | |
Merge branch 'next' of ../next
Diffstat (limited to 'board/davinci/da8xxevm/da830evm.c')
| -rw-r--r-- | board/davinci/da8xxevm/da830evm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/board/davinci/da8xxevm/da830evm.c b/board/davinci/da8xxevm/da830evm.c index 8a9f9884d6..06506537b2 100644 --- a/board/davinci/da8xxevm/da830evm.c +++ b/board/davinci/da8xxevm/da830evm.c @@ -40,8 +40,7 @@ #include <asm/arch/emif_defs.h> #include <asm/arch/emac_defs.h> #include <asm/io.h> -#include "../common/misc.h" -#include "common.h" +#include <asm/arch/davinci_misc.h> DECLARE_GLOBAL_DATA_PTR; |
