diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-13 19:53:09 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-13 19:53:09 (GMT) |
| commit | 107b56bdd8e82b07458df11f8df4a01067512281 (patch) | |
| tree | 5408cb88b9aaf65e8b8e96ea812ae09e506bea22 /include/common.h | |
| parent | 2c51983b810d73946f653a4385c65a8b7babbbe1 (diff) | |
| parent | 880c80d004acdc7370ab892df51c37c0cf0ff86d (diff) | |
| download | u-boot-fsl-qoriq-107b56bdd8e82b07458df11f8df4a01067512281.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/common.h b/include/common.h index 9ba1601..21c05db 100644 --- a/include/common.h +++ b/include/common.h @@ -272,9 +272,9 @@ int setenv (char *, char *); # include <asm/setup.h> # include <asm/u-boot-arm.h> /* ARM version to be fixed! */ #endif /* CONFIG_ARM */ -#ifdef CONFIG_I386 /* x86 version to be fixed! */ -# include <asm/u-boot-i386.h> -#endif /* CONFIG_I386 */ +#ifdef CONFIG_X86 /* x86 version to be fixed! */ +# include <asm/u-boot-x86.h> +#endif /* CONFIG_X86 */ #ifdef CONFIG_AUTO_COMPLETE int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf); |