diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /arch/sh/include/asm/unaligned.h | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sh/include/asm/unaligned.h')
| -rw-r--r-- | arch/sh/include/asm/unaligned.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/sh/include/asm/unaligned.h b/arch/sh/include/asm/unaligned.h index c1641a01d50f..8c0ad5e4487a 100644 --- a/arch/sh/include/asm/unaligned.h +++ b/arch/sh/include/asm/unaligned.h | |||
| @@ -1,7 +1,11 @@ | |||
| 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 | #ifdef CONFIG_CPU_SH4A |
| 5 | /* SH-4A can handle unaligned loads in a relatively neutered fashion. */ | ||
| 6 | #include <asm/unaligned-sh4a.h> | ||
| 7 | #else | ||
| 8 | /* Otherwise, SH can't handle unaligned accesses. */ | ||
| 5 | #ifdef __LITTLE_ENDIAN__ | 9 | #ifdef __LITTLE_ENDIAN__ |
| 6 | # include <linux/unaligned/le_struct.h> | 10 | # include <linux/unaligned/le_struct.h> |
| 7 | # include <linux/unaligned/be_byteshift.h> | 11 | # include <linux/unaligned/be_byteshift.h> |
| @@ -15,5 +19,6 @@ | |||
| 15 | # define get_unaligned __get_unaligned_be | 19 | # define get_unaligned __get_unaligned_be |
| 16 | # define put_unaligned __put_unaligned_be | 20 | # define put_unaligned __put_unaligned_be |
| 17 | #endif | 21 | #endif |
| 22 | #endif | ||
| 18 | 23 | ||
| 19 | #endif /* _ASM_SH_UNALIGNED_H */ | 24 | #endif /* _ASM_SH_UNALIGNED_H */ |