From efbf3d5eeb114b6bc78140cd4523bbdb6ac305d4 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Tue, 18 Nov 2008 20:45:23 +0100
Subject: [PATCH] --- yaml --- r: 122963 b: refs/heads/master c:
 aa6eeeef78263e9891185c6cfaaf64808460a54a h: refs/heads/master i:   122961:
 9c7bfe0c5b96281bb76d6822f48ba44b93a2dc3b   122959:
 afdedf3ec6f2453c65814fefe6cc2170ec2ee6e7 v: v3

---
 [refs]                             |  2 +-
 trunk/include/asm-m68k/byteorder.h | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a2b28a78d2ce..7ef277443e82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f877ebb32ac9a4b0783e825cef84c6ace87fe90
+refs/heads/master: aa6eeeef78263e9891185c6cfaaf64808460a54a
diff --git a/trunk/include/asm-m68k/byteorder.h b/trunk/include/asm-m68k/byteorder.h
index 81d420b35c80..b354acdafec8 100644
--- a/trunk/include/asm-m68k/byteorder.h
+++ b/trunk/include/asm-m68k/byteorder.h
@@ -4,22 +4,16 @@
 #include <asm/types.h>
 #include <linux/compiler.h>
 
-#ifdef __GNUC__
+#define __BIG_ENDIAN
+#define __SWAB_64_THRU_32__
 
-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 val)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 {
 	__asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
 	return val;
 }
-#define __arch__swab32(x) ___arch__swab32(x)
+#define __arch_swab32 __arch_swab32
 
-#endif
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#include <linux/byteorder/big_endian.h>
+#include <linux/byteorder.h>
 
 #endif /* _M68K_BYTEORDER_H */