diff options
| author | Ingo Molnar | 2009-03-06 16:44:14 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-03-06 16:45:01 +0100 |
| commit | f0ef03985130287c6c84ebe69416cf790e6cc00e (patch) | |
| tree | 3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7 /include/asm-frv | |
| parent | Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into trac... (diff) | |
| parent | Merge branch 'x86/uv' into x86/core (diff) | |
| download | kernel-qcow2-linux-f0ef03985130287c6c84ebe69416cf790e6cc00e.tar.gz kernel-qcow2-linux-f0ef03985130287c6c84ebe69416cf790e6cc00e.tar.xz kernel-qcow2-linux-f0ef03985130287c6c84ebe69416cf790e6cc00e.zip | |
Merge branch 'x86/core' into tracing/textedit
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.c
Semantic conflict:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-frv')
| -rw-r--r-- | include/asm-frv/swab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-frv/swab.h b/include/asm-frv/swab.h index afb3396ba5ed..f305834b4799 100644 --- a/include/asm-frv/swab.h +++ b/include/asm-frv/swab.h @@ -1,7 +1,7 @@ #ifndef _ASM_SWAB_H #define _ASM_SWAB_H -#include <asm/types.h> +#include <linux/types.h> #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) # define __SWAB_64_THRU_32__ |