diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/m32r/include/asm/unaligned.h | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'arch/m32r/include/asm/unaligned.h')
| -rw-r--r-- | arch/m32r/include/asm/unaligned.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/unaligned.h b/arch/m32r/include/asm/unaligned.h new file mode 100644 index 000000000000..377eb20d1ec6 --- /dev/null +++ b/arch/m32r/include/asm/unaligned.h | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | #ifndef _ASM_M32R_UNALIGNED_H | ||
| 2 | #define _ASM_M32R_UNALIGNED_H | ||
| 3 | |||
| 4 | #if defined(__LITTLE_ENDIAN__) | ||
| 5 | # include <linux/unaligned/le_memmove.h> | ||
| 6 | # include <linux/unaligned/be_byteshift.h> | ||
| 7 | # include <linux/unaligned/generic.h> | ||
| 8 | # define get_unaligned __get_unaligned_le | ||
| 9 | # define put_unaligned __put_unaligned_le | ||
| 10 | #else | ||
| 11 | # include <linux/unaligned/be_memmove.h> | ||
| 12 | # include <linux/unaligned/le_byteshift.h> | ||
| 13 | # include <linux/unaligned/generic.h> | ||
| 14 | # define get_unaligned __get_unaligned_be | ||
| 15 | # define put_unaligned __put_unaligned_be | ||
| 16 | #endif | ||
| 17 | |||
| 18 | #endif /* _ASM_M32R_UNALIGNED_H */ | ||