From 2ebfc90fdbad03482f120a931697599611f5be7e Mon Sep 17 00:00:00 2001 From: robertmh Date: Mon, 22 Oct 2007 20:14:45 +0000 Subject: [PATCH] 2007-10-22 Robert Millan * kern/i386/pc/startup.S: Remove `"kern/i386/realmode.S"'. Include `"../realmode.S"'. Remove `"kern/i386/loader.S"'. Include `"../loader.S"'. --- ChangeLog | 6 ++++++ kern/i386/pc/startup.S | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe0196e41..af794aa5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-22 Robert Millan + + * kern/i386/pc/startup.S: Remove `"kern/i386/realmode.S"'. Include + `"../realmode.S"'. + Remove `"kern/i386/loader.S"'. Include `"../loader.S"'. + 2007-10-22 Robert Millan * conf/i386-pc.rmk (kernel_img_SOURCES): Remove `disk/i386/pc/biosdisk.c'. diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S index b47728df2..4267f5b7d 100644 --- a/kern/i386/pc/startup.S +++ b/kern/i386/pc/startup.S @@ -242,7 +242,7 @@ codestart: */ call EXT_C(grub_main) -#include "kern/i386/realmode.S" +#include "../realmode.S" /* * This is the area for all of the special variables. @@ -607,8 +607,8 @@ FUNCTION(grub_chainloader_real_boot) ljmp $0, $GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR .code32 -#include "kern/i386/loader.S" - +#include "../loader.S" + /* * int grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap) *