m68k: use the new byteorder headers
authorHarvey Harrison <harvey.harrison@gmail.com>
Tue, 18 Nov 2008 19:45:23 +0000 (20:45 +0100)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 28 Dec 2008 19:00:07 +0000 (20:00 +0100)
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
include/asm-m68k/byteorder.h

index 81d420b35c80a0dfef3fd90c9cd261378b386a4d..b354acdafec8e8a2f958acf6f9639209f9a7c609 100644 (file)
@@ -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 */