projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'denx-coldfire' into coldfire-aug2007
[oweals/u-boot.git]
/
drivers
/
bios_emulator
/
biosemu.c
diff --git
a/drivers/bios_emulator/biosemu.c
b/drivers/bios_emulator/biosemu.c
index 06d4ad380f3e4ed6676e53a33e64352331052cd9..ccfc872f788bf84fbd2fa3d043befd8e5bf1b675 100644
(file)
--- a/
drivers/bios_emulator/biosemu.c
+++ b/
drivers/bios_emulator/biosemu.c
@@
-45,8
+45,12
@@
*
****************************************************************************/
*
****************************************************************************/
-#include "biosemui.h"
#include <malloc.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_sysEnv _BE_env = {{0}};
static X86EMU_memFuncs _BE_mem __attribute__((section(".got2"))) = {
@@
-368,3
+372,4
@@
int X86API BE_int86x(int intno, RMREGS * in, RMREGS * out, RMSREGS * sregs)
sregs->gs = M.x86.R_GS;
return out->x.ax;
}
sregs->gs = M.x86.R_GS;
return out->x.ax;
}
+#endif