2008-04-07 Robert Millan <rmh@aybabtu.com>

        Revert grub/machine/init.h addition by Pavel (since it breaks on
        i386-ieee1275 and others):
        * util/i386/pc/misc.c: Remove grub/machine/init.h.
        * util/powerpc/ieee1275/misc.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 060eef062bb785b739c370683c21ea16bed30aef..07241dd6d8751af856666af3219c08833ab60fdf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-07  Robert Millan  <rmh@aybabtu.com>
+
+       Revert grub/machine/init.h addition by Pavel (since it breaks on
+       i386-ieee1275 and others):
+       * util/i386/pc/misc.c: Remove grub/machine/init.h.
+       * util/powerpc/ieee1275/misc.c: Likewise.
+
 2008-04-07  Robert Millan  <rmh@aybabtu.com>
 
        * util/grub-probe.c (probe): Improve error message.

diff --git a/util/i386/pc/misc.c b/util/i386/pc/misc.c
index d289deddd944f81a323d6c4327a435eea4a701b1..8490fbf70bfda1931b34118cc4194fe4f20382fa 100644 (file)
--- a/util/i386/pc/misc.c
+++ b/util/i386/pc/misc.c
@@ -19,7 +19,6 @@
 #include <setjmp.h>
 
 #include <grub/util/misc.h>
-#include <grub/machine/init.h>
 
 void
 grub_reboot (void)

diff --git a/util/powerpc/ieee1275/misc.c b/util/powerpc/ieee1275/misc.c
index 6f79612bb99d44cf5d9e09dfc0a8c43a16b6f517..b0ce83bd249d1fbfb13392db57a028451c641370 100644 (file)
--- a/util/powerpc/ieee1275/misc.c
+++ b/util/powerpc/ieee1275/misc.c
@@ -19,7 +19,6 @@
 #include <setjmp.h>
 
 #include <grub/util/misc.h>
-#include <grub/machine/init.h>
 
 void
 grub_reboot (void)