diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /include/asm-m32r/byteorder.h | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/asm-m32r/byteorder.h')
| -rw-r--r-- | include/asm-m32r/byteorder.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-m32r/byteorder.h b/include/asm-m32r/byteorder.h index 10b2c1d11614..61ff9cfd8451 100644 --- a/include/asm-m32r/byteorder.h +++ b/include/asm-m32r/byteorder.h | |||
| @@ -1,12 +1,7 @@ | |||
| 1 | #ifndef _ASM_M32R_BYTEORDER_H | 1 | #ifndef _ASM_M32R_BYTEORDER_H |
| 2 | #define _ASM_M32R_BYTEORDER_H | 2 | #define _ASM_M32R_BYTEORDER_H |
| 3 | 3 | ||
| 4 | #include <asm/types.h> | 4 | #include <asm/swab.h> |
| 5 | |||
| 6 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | ||
| 7 | # define __BYTEORDER_HAS_U64__ | ||
| 8 | # define __SWAB_64_THRU_32__ | ||
| 9 | #endif | ||
| 10 | 5 | ||
| 11 | #if defined(__LITTLE_ENDIAN__) | 6 | #if defined(__LITTLE_ENDIAN__) |
| 12 | # include <linux/byteorder/little_endian.h> | 7 | # include <linux/byteorder/little_endian.h> |