summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/byteorder.h
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2009-01-20 17:50:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 10:38:43 -0800
commit6aeea60aee945449c93d9aa70638deeb5c4c5439 (patch)
tree232b3cf562646515e2a4ada2f28ed919d7cc5aa7 /arch/m68k/include/asm/byteorder.h
parentac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (diff)
m68k{nommu}: fixups after the header move
swab.h seems to have been missed during the header merge. Add conditionals similar to byteorder.h and remove the now unnecessary byteorder_no/mm.h Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/include/asm/byteorder.h')
-rw-r--r--arch/m68k/include/asm/byteorder.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h
index f20502a001f..31b260a8880 100644
--- a/arch/m68k/include/asm/byteorder.h
+++ b/arch/m68k/include/asm/byteorder.h
@@ -1,5 +1,6 @@
-#ifdef __uClinux__
-#include "byteorder_no.h"
-#else
-#include "byteorder_mm.h"
-#endif
+#ifndef _M68K_BYTEORDER_H
+#define _M68K_BYTEORDER_H
+
+#include <linux/byteorder/big_endian.h>
+
+#endif /* _M68K_BYTEORDER_H */