From 47d5f3c1c2238eb6bcd55215dfdbfd356b879f97 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 08:01:48 +0100
Subject: [PATCH 1/4] 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>

	* loader/mips/linux.c: Include missing grub/i18n.h.
---
 ChangeLog           | 4 ++++
 loader/mips/linux.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3fac1bd6a..772e1620b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/mips/linux.c: Include missing grub/i18n.h.
+
 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* normal/menu.c (notify_execution_failure): Clarify error message.
diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index b52f098ac..1eb747c3b 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -27,6 +27,7 @@
 #include <grub/command.h>
 #include <grub/mips/relocator.h>
 #include <grub/machine/memory.h>
+#include <grub/i18n.h>
 
 /* For frequencies.  */
 #include <grub/pci.h>

From 119c50eab3e43d7bc66c6c533dd837f1d1429855 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 08:02:45 +0100
Subject: [PATCH 2/4] 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>

	* include/grub/x86_64/at_keyboard.h: New file.
---
 ChangeLog                         | 4 ++++
 include/grub/x86_64/at_keyboard.h | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 include/grub/x86_64/at_keyboard.h

diff --git a/ChangeLog b/ChangeLog
index 772e1620b..192054e7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/x86_64/at_keyboard.h: New file.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/mips/linux.c: Include missing grub/i18n.h.
diff --git a/include/grub/x86_64/at_keyboard.h b/include/grub/x86_64/at_keyboard.h
new file mode 100644
index 000000000..c632aa85c
--- /dev/null
+++ b/include/grub/x86_64/at_keyboard.h
@@ -0,0 +1 @@
+#include <grub/i386/at_keyboard.h>

From f80927cadb4181fed6c7215fe24e3ea69c800789 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 08:04:01 +0100
Subject: [PATCH 3/4] 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>

	* conf/mips.rmk (kernel_img_HEADERS) [yeeloong]: Add pci.h.
---
 ChangeLog     | 4 ++++
 conf/mips.rmk | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 192054e7b..add252622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/mips.rmk (kernel_img_HEADERS) [yeeloong]: Add pci.h.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/x86_64/at_keyboard.h: New file.
diff --git a/conf/mips.rmk b/conf/mips.rmk
index fedfb4c54..d0b1c484c 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -19,6 +19,10 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	msdos_partition.h machine/kernel.h handler.h list.h \
 	command.h machine/memory.h cpu/libgcc.h cpu/cache.h i18n.h
 
+ifeq ($(platform), yeeloong)
+kernel_img_HEADERS += pci.h
+endif
+
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 

From 7ee92c32e1cd3e8156e9838f5ca052e52a8e5aa2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 08:04:39 +0100
Subject: [PATCH 4/4] 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>

	* include/grub/font.h (grub_font_load): Fix prototype.
---
 ChangeLog           | 4 ++++
 include/grub/font.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index add252622..d7118325c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/font.h (grub_font_load): Fix prototype.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* conf/mips.rmk (kernel_img_HEADERS) [yeeloong]: Add pci.h.
diff --git a/include/grub/font.h b/include/grub/font.h
index 2129c30b3..1816e3570 100644
--- a/include/grub/font.h
+++ b/include/grub/font.h
@@ -75,7 +75,7 @@ void grub_font_loader_init (void);
 
 /* Load a font and add it to the beginning of the global font list.
    Returns: 0 upon success; nonzero upon failure.  */
-int grub_font_load (grub_file_t file);
+int grub_font_load (const char *filename);
 
 /* Get the font that has the specified name.  Font names are in the form
    "Family Name Bold Italic 14", where Bold and Italic are optional.