diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 19:53:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 19:53:11 -0400 |
commit | e0e170bd7ded2ec16e2813d63c0faff43193fde8 (patch) | |
tree | 2f06008b61ef2eedf8f77d1326e286a64e426ef6 /arch/microblaze/include/asm/unaligned.h | |
parent | b20f9e5bddddb5ef0d743d6e0d409ffc8cf9fc56 (diff) | |
parent | b843e4ec01991a386a9e0e9030703524446e03da (diff) |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze: (42 commits)
microblaze: Fix build with make 3.82
fbdev/xilinxfb: Microblaze driver support
microblaze: Support C optimized lib functions for little-endian
microblaze: Separate library optimized functions
microblaze: Support timer on AXI lite
microblaze: Add support for little-endian Microblaze
microblaze: KGDB little endian support
microblaze: Add PVR for endians plus detection
net: emaclite: Add support for little-endian platforms
microblaze: trivial: Add comment for AXI pvr
microblaze: pci-common cleanup
microblaze: Support early console on uart16550
microblaze: Do not compile early console support for uartlite if is disabled
microblaze: Setup early console dynamically
microblaze: Rename all uartlite early printk functions
microblaze: remove early printk uarlite console dependency from header
microblaze: Remove additional compatible properties
microblaze: Remove hardcoded asm instraction for PVR loading
microblaze: Use static const char * const where possible
microblaze: Define VMALLOC_START/END
...
Diffstat (limited to 'arch/microblaze/include/asm/unaligned.h')
-rw-r--r-- | arch/microblaze/include/asm/unaligned.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/microblaze/include/asm/unaligned.h b/arch/microblaze/include/asm/unaligned.h index 3658d91ac0fb..2b97cbe500e9 100644 --- a/arch/microblaze/include/asm/unaligned.h +++ b/arch/microblaze/include/asm/unaligned.h | |||
@@ -12,12 +12,18 @@ | |||
12 | 12 | ||
13 | # ifdef __KERNEL__ | 13 | # ifdef __KERNEL__ |
14 | 14 | ||
15 | # include <linux/unaligned/be_struct.h> | 15 | # include <linux/unaligned/be_byteshift.h> |
16 | # include <linux/unaligned/le_byteshift.h> | 16 | # include <linux/unaligned/le_byteshift.h> |
17 | # include <linux/unaligned/generic.h> | 17 | # include <linux/unaligned/generic.h> |
18 | 18 | ||
19 | # define get_unaligned __get_unaligned_be | 19 | |
20 | # define put_unaligned __put_unaligned_be | 20 | # ifdef __MICROBLAZEEL__ |
21 | # define get_unaligned __get_unaligned_le | ||
22 | # define put_unaligned __put_unaligned_le | ||
23 | # else | ||
24 | # define get_unaligned __get_unaligned_be | ||
25 | # define put_unaligned __put_unaligned_be | ||
26 | # endif | ||
21 | 27 | ||
22 | # endif /* __KERNEL__ */ | 28 | # endif /* __KERNEL__ */ |
23 | #endif /* _ASM_MICROBLAZE_UNALIGNED_H */ | 29 | #endif /* _ASM_MICROBLAZE_UNALIGNED_H */ |