From 6b75f4a8db1c5341cc34bbe66e7c106582d1d78d Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 27 Jun 2011 09:45:42 +0100
Subject: [PATCH] --- yaml --- r: 273460 b: refs/heads/master c:
 dd5d1380f1379882e4adad65a85271da4662d20d h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/mips/include/asm/mipsprom.h | 6 +++---
 trunk/arch/mips/include/asm/prom.h     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b19f4a23ac62..01797d98a86e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cba2efb64be89ad5404b38f7e39b50f337f45fb9
+refs/heads/master: dd5d1380f1379882e4adad65a85271da4662d20d
diff --git a/trunk/arch/mips/include/asm/mipsprom.h b/trunk/arch/mips/include/asm/mipsprom.h
index 146d41b67adc..e93943fabeac 100644
--- a/trunk/arch/mips/include/asm/mipsprom.h
+++ b/trunk/arch/mips/include/asm/mipsprom.h
@@ -1,5 +1,5 @@
-#ifndef __ASM_MIPS_PROM_H
-#define __ASM_MIPS_PROM_H
+#ifndef __ASM_MIPSPROM_H
+#define __ASM_MIPSPROM_H
 
 #define PROM_RESET		0
 #define PROM_EXEC		1
@@ -73,4 +73,4 @@
 
 extern char *prom_getenv(char *);
 
-#endif /* __ASM_MIPS_PROM_H */
+#endif /* __ASM_MIPSPROM_H */
diff --git a/trunk/arch/mips/include/asm/prom.h b/trunk/arch/mips/include/asm/prom.h
index 857d9b7858ad..7a6e82ef449b 100644
--- a/trunk/arch/mips/include/asm/prom.h
+++ b/trunk/arch/mips/include/asm/prom.h
@@ -8,8 +8,8 @@
  * published by the Free Software Foundation.
  *
  */
-#ifndef __ASM_MIPS_PROM_H
-#define __ASM_MIPS_PROM_H
+#ifndef __ASM_PROM_H
+#define __ASM_PROM_H
 
 #ifdef CONFIG_OF
 #include <asm/bootinfo.h>
@@ -25,4 +25,4 @@ extern void device_tree_init(void);
 static inline void device_tree_init(void) { }
 #endif /* CONFIG_OF */
 
-#endif /* _ASM_MIPS_PROM_H */
+#endif /* __ASM_PROM_H */