Merge branch 'next' of ../next

[u-boot] / drivers / bios_emulator / biosemu.c

diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index 75ceb458cfeb9feac04b24af85c566a859cf6f1b..d0c652157782c0e1f4c533cb116d94ae7a86c55d 100644 (file)
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -47,13 +47,10 @@
 
 #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"))) = {
+static X86EMU_memFuncs _BE_mem __attribute__((section(GOT2_TYPE))) = {
        BE_rdb,
        BE_rdw,
        BE_rdl,
@@ -62,7 +59,7 @@ static X86EMU_memFuncs _BE_mem __attribute__((section(".got2"))) = {
        BE_wrl,
        };
 
-static X86EMU_pioFuncs _BE_pio __attribute__((section(".got2"))) = {
+static X86EMU_pioFuncs _BE_pio __attribute__((section(GOT2_TYPE))) = {
        BE_inb,
        BE_inw,
        BE_inl,
@@ -372,4 +369,3 @@ int X86API BE_int86x(int intno, RMREGS * in, RMREGS * out, RMSREGS * sregs)
        sregs->gs = M.x86.R_GS;
        return out->x.ax;
 }
-#endif