2008-01-21 Robert Millan <rmh@aybabtu.com>

        * include/grub/i386/pc/kernel.h: Include `<grub/symbol.h>'.

        * include/grub/kernel.h (grub_arch_memdisk_addr,
        grub_arch_memdisk_size): Moved from here ...

        * include/grub/i386/pc/kernel.h (grub_arch_memdisk_addr,
        grub_arch_memdisk_size): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 780b8ab3a87530d3869deae83658e11c7494276c..9aa44973d9b8750056706945e4304b9487ade61d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-21  Robert Millan  <rmh@aybabtu.com>
+
+       * include/grub/i386/pc/kernel.h: Include `<grub/symbol.h>'.
+
+       * include/grub/kernel.h (grub_arch_memdisk_addr,
+       grub_arch_memdisk_size): Moved from here ...
+
+       * include/grub/i386/pc/kernel.h (grub_arch_memdisk_addr,
+       grub_arch_memdisk_size): ... to here.
+
 2008-01-21  Robert Millan  <rmh@aybabtu.com>
 
        Mostly based on bugfix from Bean.

diff --git a/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
index 34f7ea17d62c242c0c24ea0e24d5f3eae1dd2f14..ca16df788e6dfb05c98e51518f48da6852f7fe46 100644 (file)
--- a/include/grub/i386/pc/kernel.h
+++ b/include/grub/i386/pc/kernel.h
@@ -48,6 +48,7 @@
 
 #ifndef ASM_FILE
 
+#include <grub/symbol.h>
 #include <grub/types.h>
 
 /* The size of kernel image.  */
@@ -75,6 +76,9 @@ extern grub_int32_t grub_boot_drive;
 /* The end address of the kernel.  */
 extern grub_addr_t grub_end_addr;
 
+extern grub_addr_t EXPORT_FUNC(grub_arch_memdisk_addr) (void);
+extern grub_off_t EXPORT_FUNC(grub_arch_memdisk_size) (void);
+
 #endif /* ! ASM_FILE */
 
 #endif /* ! KERNEL_MACHINE_HEADER */

diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index 7413e19bc5b7e0fae0f5b55459e9876b2e495301..4a4e2cc41c79b582a45a38e765c4a84f4f4e8578 100644 (file)
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -45,8 +45,6 @@ struct grub_module_info
 };
 
 extern grub_addr_t grub_arch_modules_addr (void);
-extern grub_addr_t EXPORT_FUNC(grub_arch_memdisk_addr) (void);
-extern grub_off_t EXPORT_FUNC(grub_arch_memdisk_size) (void);
 
 /* The start point of the C code.  */
 void grub_main (void);