* include/grub/i386/pc/init.h (grub_get_mmap_entry): Don't export.

	* conf/i386-pc.rmk (kernel_img_HEADERS): Remove machine/init.h.

diff --git a/ChangeLog b/ChangeLog
index de10988c5e132a940bb125498b7eebc67483dd77..745bbe4238608b572436a9840e8304e1175e96a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/i386/pc/init.h (grub_get_mmap_entry): Don't export.
+       * conf/i386-pc.rmk (kernel_img_HEADERS): Remove machine/init.h.
+
 2010-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Remove unused grub_vga_get_font.

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index ece88446b3847e4e8013e17197b7a8c3b57f919e..18febc879f3975ab6a491df7b260dc15414c1251 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -55,7 +55,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
        term/i386/pc/console.c term/i386/vga_common.c \
        symlist.c
 kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
-       machine/pxe.h i386/pit.h machine/init.h
+       machine/pxe.h i386/pit.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)

diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index 2be80e7730c6b86512a097b0d47bd54c68495136..30130d189b9498e17a86629353587dcd0d8f8461 100644 (file)
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -33,7 +33,7 @@ grub_uint32_t grub_get_eisa_mmap (void);
 
 /* Get a memory map entry. Return next continuation value. Zero means
    the end.  */
-grub_uint32_t EXPORT_FUNC(grub_get_mmap_entry) (struct grub_machine_mmap_entry *entry,
+grub_uint32_t grub_get_mmap_entry (struct grub_machine_mmap_entry *entry,
                                   grub_uint32_t cont);
 
 /* Turn on/off Gate A20.  */