Skip to contentSkip to conversation

m68knommu: use the new byteorder headers

PATCH In review Harvey Harrison 1 participant 1 message Jul 30, 2008

lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 12/24 m68knommu: use the new byteorder headers

Signed-off-by Harvey Harrison <[email protected]>
---
 include/asm-m68knommu/byteorder.h |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
include/asm-m68knommu/byteorder.h +5 -8
index 20bb442..6d9d3b8 100644
@@ -3,13 +3,11 @@
 
 #include <linux/types.h>
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
+#define __BIG_ENDIAN
+#define __SWAB_64_THRU_32__
 
 #if defined (__mcfisaaplus__) || defined (__mcfisac__)
-static inline __attribute_const__ __u32 ___arch__swab32(__u32 val)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 {
 	asm(
 			"byterev %0"

@@ -18,10 +16,9 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 val)
 	   );
 	return val;
 }
-
-#define __arch__swab32(x) ___arch__swab32(x)
+#define __arch_swab32 __arch_swab32
 #endif
 
-#include <linux/byteorder/big_endian.h>
+#include <linux/byteorder.h>
 
 #endif /* _M68KNOMMU_BYTEORDER_H */
Signature · 1 line
1.6.0.rc1.154.ge3fc