diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-13 21:53:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-13 21:53:09 +0200 |
| commit | 107b56bdd8e82b07458df11f8df4a01067512281 (patch) | |
| tree | 5408cb88b9aaf65e8b8e96ea812ae09e506bea22 /examples/standalone | |
| parent | 2c51983b810d73946f653a4385c65a8b7babbbe1 (diff) | |
| parent | 880c80d004acdc7370ab892df51c37c0cf0ff86d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'examples/standalone')
| -rw-r--r-- | examples/standalone/stubs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c index 2d2e7098b7..507d38ceaf 100644 --- a/examples/standalone/stubs.c +++ b/examples/standalone/stubs.c @@ -4,7 +4,7 @@ #define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__) #endif /* GCC_VERSION */ -#if defined(CONFIG_I386) +#if defined(CONFIG_X86) /* * x86 does not have a dedicated register to store the pointer to * the global_data. Thus the jump table address is stored in a @@ -198,7 +198,7 @@ void app_startup(char * const *argv) *cp++ = 0; } -#if defined(CONFIG_I386) +#if defined(CONFIG_X86) /* x86 does not have a dedicated register for passing global_data */ global_data = (gd_t *)argv[-1]; jt = global_data->jt; |