Merge master.kernel.org:/home/rmk/linux-2.6-serial

[karo-tx-linux.git] / include / asm-powerpc / string.h

diff --git a/include/asm-powerpc/string.h b/include/asm-powerpc/string.h
index 225575997392a99db649a8018f58297450e35cfa..8606a696c088187ae65457c905f5a492b4ad2ac1 100644 (file)
--- a/include/asm-powerpc/string.h
+++ b/include/asm-powerpc/string.h
@@ -1,5 +1,5 @@
-#ifndef _PPC_STRING_H_
-#define _PPC_STRING_H_
+#ifndef _ASM_POWERPC_STRING_H
+#define _ASM_POWERPC_STRING_H
 
 #ifdef __KERNEL__
 
@@ -29,4 +29,4 @@ extern void * memchr(const void *,int,__kernel_size_t);
 
 #endif /* __KERNEL__ */
 
-#endif
+#endif /* _ASM_POWERPC_STRING_H */