diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2009-01-20 20:50:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 13:38:43 -0500 |
| commit | 6aeea60aee945449c93d9aa70638deeb5c4c5439 (patch) | |
| tree | 232b3cf562646515e2a4ada2f28ed919d7cc5aa7 /arch/m68k/include/asm/byteorder.h | |
| parent | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (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.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 @@ | |||
| 1 | #ifdef __uClinux__ | 1 | #ifndef _M68K_BYTEORDER_H |
| 2 | #include "byteorder_no.h" | 2 | #define _M68K_BYTEORDER_H |
| 3 | #else | 3 | |
| 4 | #include "byteorder_mm.h" | 4 | #include <linux/byteorder/big_endian.h> |
| 5 | #endif | 5 | |
| 6 | #endif /* _M68K_BYTEORDER_H */ | ||