diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:38:54 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:38:54 +0200 |
| commit | d1c6e9e44a7218b390962e90ed462a134564676f (patch) | |
| tree | e16fee6f8aceb8527e51c7b955bddbffa3219bbc /include | |
| parent | 76aef69e49318863cb9966f872a80ddb5586d666 (diff) | |
| parent | e034ea3b77baf90ab8dde2c1beeb22704b01fb2d (diff) | |
| download | u-boot-imx-d1c6e9e44a7218b390962e90ed462a134564676f.zip u-boot-imx-d1c6e9e44a7218b390962e90ed462a134564676f.tar.gz u-boot-imx-d1c6e9e44a7218b390962e90ed462a134564676f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
* 'master' of git://git.denx.de/u-boot-mips:
MIPS: board.c: move extern declarations to u-boot-mips.h
MIPS: bootm_qemu_mips.c: make checkpatch.pl clean
MIPS: bootm.c: make checkpatch.pl clean
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include')
| -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 8564a65..ecfa6c4 100644 --- a/include/common.h +++ b/include/common.h @@ -355,6 +355,9 @@ int setenv_addr(const char *varname, const void *addr); # include <asm/mach-types.h> # include <asm/u-boot-nds32.h> #endif /* CONFIG_NDS32 */ +#ifdef CONFIG_MIPS +# include <asm/u-boot-mips.h> +#endif /* CONFIG_MIPS */ #ifdef CONFIG_AUTO_COMPLETE int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf); |