aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2010-05-27 14:37:53 +0900
committerBlue Swirl <blauwirbel@gmail.com>2010-06-10 16:48:32 +0000
commitfe7f9567a6934566641751df233cb45675a9130c (patch)
treec724c2978419e41a055142624d6d8d1126220112
parent0f2ad63fcb75c9679ff7d47f6b2235dfc646de35 (diff)
vga-isa-mm: remove one #ifdef CONFIG_BOCHS_VBE.
remove one #ifdef CONFIG_BOCHS_VBE. Call vga_init_vbe() instead. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--hw/vga-isa-mm.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c
index 2faefa51b1..8e31e36ea5 100644
--- a/hw/vga-isa-mm.c
+++ b/hw/vga-isa-mm.c
@@ -121,10 +121,6 @@ int isa_vga_mm_init(target_phys_addr_t vram_base,
s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
s->vga.screen_dump, s->vga.text_update, s);
-#ifdef CONFIG_BOCHS_VBE
- /* XXX: use optimized standard vga accesses */
- cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS,
- VGA_RAM_SIZE, s->vga.vram_offset);
-#endif
+ vga_init_vbe(&s->vga);
return 0;
}