Merge branch 'master' of git://www.denx.de/git/u-boot-net

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

diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index 4c4bc8d7ba18ee3c5dc1bac212a377e843a0f07d..cb1b0c1b958a473072e483c23b62187d01bfe258 100644 (file)
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -47,9 +47,12 @@
 *
 ****************************************************************************/
 
-#include "biosemui.h"
+#include <common.h>
 
 #if defined(CONFIG_BIOSEMU)
+
+#include "biosemui.h"
+
 /*------------------------- Global Variables ------------------------------*/
 
 #ifndef __i386__
@@ -93,7 +96,7 @@ static u8 *BE_memaddr(u32 addr)
        else if (addr >= 0xFFFF5 && addr < 0xFFFFE) {
                /* Return a faked BIOS date string for non-x86 machines */
                DB(printf("BE_memaddr - Returning BIOS date\n");)
-               return BE_biosDate + addr - 0xFFFF5;
+               return (u8 *)(BE_biosDate + addr - 0xFFFF5);
        } else if (addr == 0xFFFFE) {
                /* Return system model identifier for non-x86 machines */
                DB(printf("BE_memaddr - Returning model\n");)