* include/grub/mips/kernel.h: Fix define conflict.

diff --git a/ChangeLog b/ChangeLog
index 55f0979655ac9d498dbbdc132edbb8ce0849e66d..15e7344f2be3b18d1df9f34ff756fb4e842cfd94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/mips/kernel.h: Fix define conflict.
+
 2011-07-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/mips/cache_flush.S [GRUB_MACHINE_MIPS_LOONGSON]: Flush

diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index d82d0a97dcd68dd9b7dafbbd9779d2f32ba40091..d351f17cbf6e3c2dcff53b57dfe3e34fcb67ba29 100644 (file)
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -16,8 +16,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GRUB_KERNEL_MACHINE_HEADER
-#define GRUB_KERNEL_MACHINE_HEADER     1
+#ifndef GRUB_KERNEL_CPU_HEADER
+#define GRUB_KERNEL_CPU_HEADER 1
 
 #include <grub/symbol.h>