diff options
author | Wolfgang Denk <wd@denx.de> | 2008-02-14 23:06:18 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-02-14 23:06:18 (GMT) |
commit | 6f99eec3dc2285abfb93631003f7e5cadf2eab0f (patch) | |
tree | 1eaaa31eb768d8bfa68e9ff41eef53d37b64f21c /include/common.h | |
parent | f6921e3dc331293c873ec4d109fd5517a42a90b3 (diff) | |
parent | 30942b18b66f35f2ceedab39af10e9eccaa943cc (diff) | |
download | u-boot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.tar.xz |
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Conflicts:
Makefile
doc/README.standalone
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/common.h')
-rw-r--r-- | include/common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h index 13428b3..93e3f7a 100644 --- a/include/common.h +++ b/include/common.h @@ -103,6 +103,9 @@ typedef volatile unsigned char vu_char; #ifdef CONFIG_ARM #define asmlinkage /* nothing */ #endif +#ifdef CONFIG_BLACKFIN +#include <asm/blackfin.h> +#endif #include <part.h> #include <flash.h> |