2007-10-22 Robert Millan <rmh@aybabtu.com>

	* kern/i386/pc/startup.S: Remove `"kern/i386/realmode.S"'.  Include
	`"../realmode.S"'.
	Remove `"kern/i386/loader.S"'.  Include `"../loader.S"'.

diff --git a/ChangeLog b/ChangeLog
index fe0196e41af12ec20600d61015a094af3d9df487..af794aa5fb08d4916399771f96451ee2ecb80ebd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-22  Robert Millan  <rmh@aybabtu.com>
+
+       * 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  <rmh@aybabtu.com>
 
        * 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 b47728df2fd8211f6611b86e5e71844267209040..4267f5b7dfbd26246e590669919466dbd213eb71 100644 (file)
--- 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)
  *