Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / m68k / include / asm / unaligned.h

diff --git a/arch/m68k/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned.h
index eb1ea4c..019caa7 100644 (file)
--- a/arch/m68k/include/asm/unaligned.h
+++ b/arch/m68k/include/asm/unaligned.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_M68KNOMMU_UNALIGNED_H
-#define _ASM_M68KNOMMU_UNALIGNED_H
+#ifndef _ASM_M68K_UNALIGNED_H
+#define _ASM_M68K_UNALIGNED_H
 
 
 #ifdef CONFIG_COLDFIRE
@@ -22,4 +22,4 @@
 
 #endif
 
-#endif /* _ASM_M68KNOMMU_UNALIGNED_H */
+#endif /* _ASM_M68K_UNALIGNED_H */