diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-18 22:00:57 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@sgi.com> | 2009-01-18 22:00:57 -0500 |
| commit | 6c5200ce3c528a8f7695ee62f33ad84d8f84d444 (patch) | |
| tree | b240465c2dadbe0366a5b66d60c4776be1b7670d /arch/mips/include/asm/byteorder.h | |
| parent | 9d87c3192d96ef9ac1cec8321538e9b35e90b5aa (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/include/asm/byteorder.h')
| -rw-r--r-- | arch/mips/include/asm/byteorder.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/include/asm/byteorder.h b/arch/mips/include/asm/byteorder.h index 607b71830707..9579051ff1c7 100644 --- a/arch/mips/include/asm/byteorder.h +++ b/arch/mips/include/asm/byteorder.h | |||
| @@ -8,8 +8,6 @@ | |||
| 8 | #ifndef _ASM_BYTEORDER_H | 8 | #ifndef _ASM_BYTEORDER_H |
| 9 | #define _ASM_BYTEORDER_H | 9 | #define _ASM_BYTEORDER_H |
| 10 | 10 | ||
| 11 | #include <asm/swab.h> | ||
| 12 | |||
| 13 | #if defined(__MIPSEB__) | 11 | #if defined(__MIPSEB__) |
| 14 | #include <linux/byteorder/big_endian.h> | 12 | #include <linux/byteorder/big_endian.h> |
| 15 | #elif defined(__MIPSEL__) | 13 | #elif defined(__MIPSEL__) |