merge with mainline

This commit is contained in:
BVK Chaitanya 2010-05-10 12:59:57 +05:30
commit 7361f78ca6
10 changed files with 616 additions and 578 deletions

View file

@ -184,7 +184,7 @@ vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For vga.mod.
vga_mod_SOURCES = term/i386/pc/vga.c
vga_mod_SOURCES = video/i386/pc/vga.c
vga_mod_CFLAGS = $(COMMON_CFLAGS)
vga_mod_LDFLAGS = $(COMMON_LDFLAGS)