diff --git a/[refs] b/[refs]
index dd416f71db89..df952c5602b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f15d411ad9986185303b556e0f5e7acafc4ef223
+refs/heads/master: 919594765dcf803017b2227425c1b27b5ea537be
diff --git a/trunk/include/asm-frv/Kbuild b/trunk/include/asm-frv/Kbuild
index 0f8956def738..1f44e7c76995 100644
--- a/trunk/include/asm-frv/Kbuild
+++ b/trunk/include/asm-frv/Kbuild
@@ -3,3 +3,4 @@ include include/asm-generic/Kbuild.asm
 header-y += registers.h
 
 unifdef-y += termios.h
+unifdef-y += swab.h
diff --git a/trunk/include/asm-frv/byteorder.h b/trunk/include/asm-frv/byteorder.h
index 411bec3cc1fc..1187e51ecd13 100644
--- a/trunk/include/asm-frv/byteorder.h
+++ b/trunk/include/asm-frv/byteorder.h
@@ -1,13 +1,7 @@
 #ifndef _ASM_BYTEORDER_H
 #define _ASM_BYTEORDER_H
 
-#include <asm/types.h>
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
+#include <asm/swab.h>
 #include <linux/byteorder/big_endian.h>
 
 #endif /* _ASM_BYTEORDER_H */
diff --git a/trunk/include/asm-frv/swab.h b/trunk/include/asm-frv/swab.h
new file mode 100644
index 000000000000..afb3396ba5ed
--- /dev/null
+++ b/trunk/include/asm-frv/swab.h
@@ -0,0 +1,10 @@
+#ifndef _ASM_SWAB_H
+#define _ASM_SWAB_H
+
+#include <asm/types.h>
+
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
+#  define __SWAB_64_THRU_32__
+#endif
+
+#endif /* _ASM_SWAB_H */