diff options
author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-10-02 19:05:53 +0200 |
---|---|---|
committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-10-02 19:05:53 +0200 |
commit | b90296fc39a33f84bb2b0aa79bf997be495ba791 (patch) | |
tree | 4ea0d61df25d10fe7552aedf781fd167f4c670fe /drivers/bios_emulator/biosemu.c | |
parent | e80e585b00fbbab7ad1bf71619741f2c5b029ab7 (diff) | |
parent | 527c80f012030fa0b51f8594847ec56c9317e9b1 (diff) | |
download | talos-obmc-uboot-b90296fc39a33f84bb2b0aa79bf997be495ba791.tar.gz talos-obmc-uboot-b90296fc39a33f84bb2b0aa79bf997be495ba791.zip |
Merge commit 'origin/master'
Diffstat (limited to 'drivers/bios_emulator/biosemu.c')
-rw-r--r-- | drivers/bios_emulator/biosemu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c index 4c3aedf413..ccfc872f78 100644 --- a/drivers/bios_emulator/biosemu.c +++ b/drivers/bios_emulator/biosemu.c @@ -45,11 +45,13 @@ * ****************************************************************************/ -#include "biosemui.h" #include <malloc.h> +#include <common.h> #if defined(CONFIG_BIOSEMU) +#include "biosemui.h" + BE_sysEnv _BE_env = {{0}}; static X86EMU_memFuncs _BE_mem __attribute__((section(".got2"))) = { BE_rdb, |