Fix coreboot compilation.

	* grub-core/term/i386/pc/vga_text.c (grub_vga_text_init): Rename to ...
	(grub_vga_text_init_real): ... this.
	(grub_vga_text_fini): Rename to ...
	(grub_vga_text_fini_real): ... this.

diff --git a/ChangeLog b/ChangeLog
index 5e54eda8d94437f213fe93252885e54cc56e5f16..35e76af29c275bea707ce6e291d09c6829c7adb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix coreboot compilation.
+
+       * grub-core/term/i386/pc/vga_text.c (grub_vga_text_init): Rename to ...
+       (grub_vga_text_init_real): ... this.
+       (grub_vga_text_fini): Rename to ...
+       (grub_vga_text_fini_real): ... this.
+
 2012-07-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/Makefile.am: Fix path to boot/i386/pc/startup_raw.S.

diff --git a/grub-core/term/i386/pc/vga_text.c b/grub-core/term/i386/pc/vga_text.c
index d1e4ef9408996a5c13849255478ed11e1760cc72..74c155c530e57708b3a106e0b99beffe11707c57 100644 (file)
--- a/grub-core/term/i386/pc/vga_text.c
+++ b/grub-core/term/i386/pc/vga_text.c
@@ -167,7 +167,7 @@ grub_vga_text_setcursor (struct grub_term_output *term __attribute__ ((unused)),
 }
 
 static grub_err_t
-grub_vga_text_init (struct grub_term_output *term)
+grub_vga_text_init_real (struct grub_term_output *term)
 {
 #ifdef MODESET
   struct grub_bios_int_registers regs;
@@ -186,7 +186,7 @@ grub_vga_text_init (struct grub_term_output *term)
 }
 
 static grub_err_t
-grub_vga_text_fini (struct grub_term_output *term)
+grub_vga_text_fini_real (struct grub_term_output *term)
 {
 #ifdef MODESET
   struct grub_bios_int_registers regs;
@@ -255,8 +255,8 @@ static struct grub_term_output grub_vga_text_term =
 #else
     .name = "vga_text",
 #endif
-    .init = grub_vga_text_init,
-    .fini = grub_vga_text_fini,
+    .init = grub_vga_text_init_real,
+    .fini = grub_vga_text_fini_real,
     .putchar = grub_vga_text_putchar,
     .getwh = grub_vga_text_getwh,
     .getxy = grub_vga_text_getxy,