aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mn10300/swab.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 11:05:58 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-13 11:05:58 +0100
commitcd80a8142efa3468c2cd9fb52845f334c3220d54 (patch)
tree919e88994bd3c09b34ce852d0a09bb0655d231d0 /include/asm-mn10300/swab.h
parentgeneric-ipi: eliminate WARN_ON()s during oops/panic (diff)
parentMerge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' and 'linus' into x86/core (diff)
downloadlinux-dev-cd80a8142efa3468c2cd9fb52845f334c3220d54.tar.xz
linux-dev-cd80a8142efa3468c2cd9fb52845f334c3220d54.zip
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'include/asm-mn10300/swab.h')
-rw-r--r--include/asm-mn10300/swab.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mn10300/swab.h b/include/asm-mn10300/swab.h
index 4504d1b4b477..bd818a820ca8 100644
--- a/include/asm-mn10300/swab.h
+++ b/include/asm-mn10300/swab.h
@@ -11,7 +11,7 @@
#ifndef _ASM_SWAB_H
#define _ASM_SWAB_H
-#include <asm/types.h>
+#include <linux/types.h>
#ifdef __GNUC__