diff --git a/[refs] b/[refs]
index e402903d7cce..8bc1677211bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c49888203d7a316cb947bb8a1cf2ae191f28bcd3
+refs/heads/master: b41fc4f82f6a73b8b2e8f44bd7ef075797d2dacb
diff --git a/trunk/include/asm-powerpc/machdep.h b/trunk/include/asm-powerpc/machdep.h
index b3a93b476d97..706508b1b04b 100644
--- a/trunk/include/asm-powerpc/machdep.h
+++ b/trunk/include/asm-powerpc/machdep.h
@@ -1,5 +1,5 @@
-#ifndef _PPC64_MACHDEP_H
-#define _PPC64_MACHDEP_H
+#ifndef _ASM_POWERPC_MACHDEP_H
+#define _ASM_POWERPC_MACHDEP_H
 #ifdef __KERNEL__
 
 /*
@@ -281,4 +281,4 @@ static inline void log_error(char *buf, unsigned int err_type, int fatal)
 }
 
 #endif /* __KERNEL__ */
-#endif /* _PPC64_MACHDEP_H */
+#endif /* _ASM_POWERPC_MACHDEP_H */