From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 3 Jan 2010 15:45:54 +0000 (+0000)
Subject: 2010-01-03  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1148561e45ac817e2de8aacacae59f756c115ebd;p=thirdparty%2Fgrub.git

2010-01-03  Robert Millan  <rmh.grub@aybabtu.com>

	* doc/boot.S (MULTIBOOT_HEADER_FLAGS): Redefine using macros.
---

diff --git a/ChangeLog b/ChangeLog
index b7f02e9fe..925600e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-03  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* doc/boot.S (MULTIBOOT_HEADER_FLAGS): Redefine using macros.
+
 2010-01-03  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* Makefile.am (web-manual): Add `all' as dependency.
diff --git a/doc/boot.S b/doc/boot.S
index edf9268e2..c8d517106 100644
--- a/doc/boot.S
+++ b/doc/boot.S
@@ -30,10 +30,11 @@
 
 /* The flags for the Multiboot header.  */
 #ifdef __ELF__
-# define MULTIBOOT_HEADER_FLAGS		0x00000003
+# define AOUT_KLUDGE 0
 #else
-# define MULTIBOOT_HEADER_FLAGS		0x00010003
+# define AOUT_KLUDGE MULTIBOOT_AOUT_KLUDGE
 #endif
+#define MULTIBOOT_HEADER_FLAGS			MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | AOUT_KLUDGE
 	
 	.text