diff options
| author | Harvey Harrison | 2009-01-21 02:50:51 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-01-26 19:38:43 +0100 |
| commit | 6aeea60aee945449c93d9aa70638deeb5c4c5439 (patch) | |
| tree | 232b3cf562646515e2a4ada2f28ed919d7cc5aa7 /arch/m68k/include/asm/byteorder.h | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg... (diff) | |
| download | kernel-qcow2-linux-6aeea60aee945449c93d9aa70638deeb5c4c5439.tar.gz kernel-qcow2-linux-6aeea60aee945449c93d9aa70638deeb5c4c5439.tar.xz kernel-qcow2-linux-6aeea60aee945449c93d9aa70638deeb5c4c5439.zip | |
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.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h index f20502a001f5..31b260a88803 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 */ |