diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:34:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:34:46 -0700 |
| commit | 17fad5209e6b55148dbd20156cdaf2c7e67faa40 (patch) | |
| tree | 0b014c85f699b829f785a90ce193dec814af9ba9 /arch/blackfin/include/asm/unaligned.h | |
| parent | 898f96fd5059854bef89d2a65a6de737bd5c5411 (diff) | |
| parent | eec511d75edd5139ea6de537f6908085b171e7a0 (diff) | |
| download | blackbird-op-linux-17fad5209e6b55148dbd20156cdaf2c7e67faa40.tar.gz blackbird-op-linux-17fad5209e6b55148dbd20156cdaf2c7e67faa40.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: convert page/tlb to asm-generic
Blackfin: convert types to asm-generic
Blackfin: convert irq/process to asm-generic
Blackfin: convert signal/mmap to asm-generic
Blackfin: convert locking primitives to asm-generic
Blackfin: convert termios to asm-generic
Blackfin: convert simple headers to asm-generic
Blackfin: convert socket/poll to asm-generic
Blackfin: convert user/elf to asm-generic
Blackfin: convert shm/sysv/ipc to asm-generic
Blackfin: convert asm/ioctls.h to asm-generic/ioctls.h
Blackfin: only build irqpanic.c when needed
Blackfin: pull in asm/io.h in ksyms for prototypes
Blackfin: use common test_bit() rather than __test_bit()
Diffstat (limited to 'arch/blackfin/include/asm/unaligned.h')
| -rw-r--r-- | arch/blackfin/include/asm/unaligned.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/blackfin/include/asm/unaligned.h b/arch/blackfin/include/asm/unaligned.h index fd8a1d634945..6cecbbb2111f 100644 --- a/arch/blackfin/include/asm/unaligned.h +++ b/arch/blackfin/include/asm/unaligned.h @@ -1,11 +1 @@ -#ifndef _ASM_BLACKFIN_UNALIGNED_H -#define _ASM_BLACKFIN_UNALIGNED_H - -#include <linux/unaligned/le_struct.h> -#include <linux/unaligned/be_byteshift.h> -#include <linux/unaligned/generic.h> - -#define get_unaligned __get_unaligned_le -#define put_unaligned __put_unaligned_le - -#endif /* _ASM_BLACKFIN_UNALIGNED_H */ +#include <asm-generic/unaligned.h> |
