diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 15:37:27 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 15:37:27 (GMT) |
| commit | 77835492ed489c0b870f82f4c50687bd267acc0a (patch) | |
| tree | d80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /arch/parisc/include/asm/byteorder.h | |
| parent | af37501c792107c2bde1524bdae38d9a247b841a (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
| download | linux-fsl-qoriq-77835492ed489c0b870f82f4c50687bd267acc0a.tar.xz | |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
Diffstat (limited to 'arch/parisc/include/asm/byteorder.h')
| -rw-r--r-- | arch/parisc/include/asm/byteorder.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/byteorder.h b/arch/parisc/include/asm/byteorder.h index da66029..58af2c5 100644 --- a/arch/parisc/include/asm/byteorder.h +++ b/arch/parisc/include/asm/byteorder.h @@ -1,7 +1,6 @@ #ifndef _PARISC_BYTEORDER_H #define _PARISC_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* _PARISC_BYTEORDER_H */ |