From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 23 Jul 2011 15:14:38 +0000 (+0200)
Subject: 	* include/grub/mips/kernel.h: Fix define conflict.
X-Git-Tag: 2.00~1154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1167439107cc51d864452c7249c994f6b5b2ce1;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index 55f097965..15e7344f2 100644
--- 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 d82d0a97d..d351f17cb 100644
--- 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>