diff --git a/[refs] b/[refs]
index 810e13a5c6da..dd416f71db89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 231cc432f4d684b8c75d9a8e0654c51b9d6ed341
+refs/heads/master: f15d411ad9986185303b556e0f5e7acafc4ef223
diff --git a/trunk/include/asm-m32r/Kbuild b/trunk/include/asm-m32r/Kbuild
index c68e1680da01..27b108a86b39 100644
--- a/trunk/include/asm-m32r/Kbuild
+++ b/trunk/include/asm-m32r/Kbuild
@@ -1 +1,2 @@
 include include/asm-generic/Kbuild.asm
+unifdef-y += swab.h
diff --git a/trunk/include/asm-m32r/byteorder.h b/trunk/include/asm-m32r/byteorder.h
index 10b2c1d11614..61ff9cfd8451 100644
--- a/trunk/include/asm-m32r/byteorder.h
+++ b/trunk/include/asm-m32r/byteorder.h
@@ -1,12 +1,7 @@
 #ifndef _ASM_M32R_BYTEORDER_H
 #define _ASM_M32R_BYTEORDER_H
 
-#include <asm/types.h>
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
+#include <asm/swab.h>
 
 #if defined(__LITTLE_ENDIAN__)
 #  include <linux/byteorder/little_endian.h>
diff --git a/trunk/include/asm-m32r/swab.h b/trunk/include/asm-m32r/swab.h
new file mode 100644
index 000000000000..97973e101825
--- /dev/null
+++ b/trunk/include/asm-m32r/swab.h
@@ -0,0 +1,10 @@
+#ifndef _ASM_M32R_SWAB_H
+#define _ASM_M32R_SWAB_H
+
+#include <asm/types.h>
+
+#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
+#  define __SWAB_64_THRU_32__
+#endif
+
+#endif /* _ASM_M32R_SWAB_H */