From: proski <proski@localhost>
Date: Thu, 11 Jun 2009 16:41:24 +0000 (+0000)
Subject: 2009-06-11  Pavel Roskin  <proski@gnu.org>
X-Git-Tag: 1.98~822
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22cd079d3b188265c89ae3add12ffdfe25303d5c;p=thirdparty%2Fgrub.git

2009-06-11  Pavel Roskin  <proski@gnu.org>

	* loader/ieee1275/multiboot2.c [__i386__]: Include
	grub/cpu/multiboot.h.
---

diff --git a/ChangeLog b/ChangeLog
index 2053f2d59..78378f597 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-11  Pavel Roskin  <proski@gnu.org>
 
+	* loader/ieee1275/multiboot2.c [__i386__]: Include
+	grub/cpu/multiboot.h.
+
 	* term/i386/pc/serial.c (serial_translate_key_sequence): Avoid
 	casts to short - they are not portable and cause warnings.  Fix
 	use of uninitialized values in input_buf.  Use ARRAY_SIZE.
diff --git a/loader/ieee1275/multiboot2.c b/loader/ieee1275/multiboot2.c
index 61f21b0e5..d1444ceff 100644
--- a/loader/ieee1275/multiboot2.c
+++ b/loader/ieee1275/multiboot2.c
@@ -27,6 +27,9 @@
 #include <grub/mm.h>
 #include <grub/machine/kernel.h>
 #include <grub/machine/loader.h>
+#ifdef __i386__
+#include <grub/cpu/multiboot.h>
+#endif
 
 typedef void (*kernel_entry_t) (unsigned long, void *, int (void *),
                                 unsigned long, unsigned long);