summaryrefslogtreecommitdiffstats
path: root/util/x86emu/yabel/vbe.c
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2009-08-24 13:07:34 +0000
committerStefan Reinauer <stefan.reinauer@coreboot.org>2009-08-24 13:07:34 +0000
commit6dc8cc1b190cdcfbbc32d18954d44c5dda336464 (patch)
treeb95009737f2cc7b1f94743d40e93addb1d3f76ab /util/x86emu/yabel/vbe.c
parent990dbb3a0fde7e5306dcbcf54ca0d0e5aa0d4c47 (diff)
downloadcoreboot-6dc8cc1b190cdcfbbc32d18954d44c5dda336464.tar.gz
coreboot-6dc8cc1b190cdcfbbc32d18954d44c5dda336464.tar.bz2
coreboot-6dc8cc1b190cdcfbbc32d18954d44c5dda336464.zip
back out all changes made by me since r1163. They were basically all
coreboot-v2 only. This gets you guys a compiling v3 tree again. Sorry for the inconvenience. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://coreboot.org/repository/coreboot-v3@1177 f3766cd6-281f-0410-b1cd-43a5c92072e9
Diffstat (limited to 'util/x86emu/yabel/vbe.c')
-rw-r--r--util/x86emu/yabel/vbe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/x86emu/yabel/vbe.c b/util/x86emu/yabel/vbe.c
index a2c9f8265584..90ab0f991a50 100644
--- a/util/x86emu/yabel/vbe.c
+++ b/util/x86emu/yabel/vbe.c
@@ -13,7 +13,7 @@
#include <string.h>
#include <types.h>
-#ifndef CONFIG_COREBOOT_V2
+#ifndef COREBOOT_V2
#include <cpu.h>
#endif
@@ -21,7 +21,7 @@
#include <x86emu/x86emu.h>
#include <x86emu/regs.h>
-#ifdef CONFIG_COREBOOT_V2
+#ifdef COREBOOT_V2
#include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h> // for push_word