diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-sh/unaligned.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sh/unaligned.h')
| -rw-r--r-- | include/asm-sh/unaligned.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/asm-sh/unaligned.h b/include/asm-sh/unaligned.h index 5250e3063b42..c1641a01d50f 100644 --- a/include/asm-sh/unaligned.h +++ b/include/asm-sh/unaligned.h | |||
| @@ -1,7 +1,19 @@ | |||
| 1 | #ifndef __ASM_SH_UNALIGNED_H | 1 | #ifndef _ASM_SH_UNALIGNED_H |
| 2 | #define __ASM_SH_UNALIGNED_H | 2 | #define _ASM_SH_UNALIGNED_H |
| 3 | 3 | ||
| 4 | /* SH can't handle unaligned accesses. */ | 4 | /* SH can't handle unaligned accesses. */ |
| 5 | #include <asm-generic/unaligned.h> | 5 | #ifdef __LITTLE_ENDIAN__ |
| 6 | # include <linux/unaligned/le_struct.h> | ||
| 7 | # include <linux/unaligned/be_byteshift.h> | ||
| 8 | # include <linux/unaligned/generic.h> | ||
| 9 | # define get_unaligned __get_unaligned_le | ||
| 10 | # define put_unaligned __put_unaligned_le | ||
| 11 | #else | ||
| 12 | # include <linux/unaligned/be_struct.h> | ||
| 13 | # include <linux/unaligned/le_byteshift.h> | ||
| 14 | # include <linux/unaligned/generic.h> | ||
| 15 | # define get_unaligned __get_unaligned_be | ||
| 16 | # define put_unaligned __put_unaligned_be | ||
| 17 | #endif | ||
| 6 | 18 | ||
| 7 | #endif /* __ASM_SH_UNALIGNED_H */ | 19 | #endif /* _ASM_SH_UNALIGNED_H */ |