diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-21 16:37:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 16:37:27 +0100 |
| commit | 77835492ed489c0b870f82f4c50687bd267acc0a (patch) | |
| tree | d80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /arch/avr32/include/asm/byteorder.h | |
| parent | Merge branch 'core/percpu' into perfcounters/core (diff) | |
| parent | Linux 2.6.29-rc2 (diff) | |
| download | linux-dev-77835492ed489c0b870f82f4c50687bd267acc0a.tar.xz linux-dev-77835492ed489c0b870f82f4c50687bd267acc0a.zip | |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
Diffstat (limited to 'arch/avr32/include/asm/byteorder.h')
| -rw-r--r-- | arch/avr32/include/asm/byteorder.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/include/asm/byteorder.h b/arch/avr32/include/asm/byteorder.h index 2aba64b4e122..50abc21619a8 100644 --- a/arch/avr32/include/asm/byteorder.h +++ b/arch/avr32/include/asm/byteorder.h @@ -4,7 +4,6 @@ #ifndef __ASM_AVR32_BYTEORDER_H #define __ASM_AVR32_BYTEORDER_H -#include <asm/swab.h> #include <linux/byteorder/big_endian.h> #endif /* __ASM_AVR32_BYTEORDER_H */ |