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-m68k/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-m68k/byteorder.h')
| -rw-r--r-- | include/asm-m68k/byteorder.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/asm-m68k/byteorder.h b/include/asm-m68k/byteorder.h index b354acdafec8..300866523b86 100644 --- a/include/asm-m68k/byteorder.h +++ b/include/asm-m68k/byteorder.h | |||
| @@ -1,19 +1,7 @@ | |||
| 1 | #ifndef _M68K_BYTEORDER_H | 1 | #ifndef _M68K_BYTEORDER_H |
| 2 | #define _M68K_BYTEORDER_H | 2 | #define _M68K_BYTEORDER_H |
| 3 | 3 | ||
| 4 | #include <asm/types.h> | 4 | #include <asm/swab.h> |
| 5 | #include <linux/compiler.h> | 5 | #include <linux/byteorder/big_endian.h> |
| 6 | |||
| 7 | #define __BIG_ENDIAN | ||
| 8 | #define __SWAB_64_THRU_32__ | ||
| 9 | |||
| 10 | static inline __attribute_const__ __u32 __arch_swab32(__u32 val) | ||
| 11 | { | ||
| 12 | __asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val)); | ||
| 13 | return val; | ||
| 14 | } | ||
| 15 | #define __arch_swab32 __arch_swab32 | ||
| 16 | |||
| 17 | #include <linux/byteorder.h> | ||
| 18 | 6 | ||
| 19 | #endif /* _M68K_BYTEORDER_H */ | 7 | #endif /* _M68K_BYTEORDER_H */ |