merge mainline into asprintf

ChangeLog

@@ -1,3 +1,19 @@
+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.
+
+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.
+
 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* normal/menu.c (notify_execution_failure): Clarify error message.

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)
 

include/grub/font.h

@@ -75,8 +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 (const char *filename);
+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.

include/grub/x86_64/at_keyboard.h

@@ -0,0 +1 @@
+#include <grub/i386/at_keyboard.h>

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>