summaryrefslogtreecommitdiff
path: root/include/asm-m32r/swab.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-03-28 06:57:13 +0300
committerJames Morris <jmorris@namei.org>2009-03-28 06:57:13 +0300
commitbb798169d1bb860b07192cf9c75937fadc8610b4 (patch)
treefa67f14406a1e79897e6f29e59fed7c02ec31c30 /include/asm-m32r/swab.h
parenta106cbfd1f3703402fc2d95d97e7a054102250f0 (diff)
parent5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff)
downloadlinux-bb798169d1bb860b07192cf9c75937fadc8610b4.tar.xz
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'include/asm-m32r/swab.h')
-rw-r--r--include/asm-m32r/swab.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m32r/swab.h b/include/asm-m32r/swab.h
index 97973e101825..54dab001d6d1 100644
--- a/include/asm-m32r/swab.h
+++ b/include/asm-m32r/swab.h
@@ -1,7 +1,7 @@
#ifndef _ASM_M32R_SWAB_H
#define _ASM_M32R_SWAB_H
-#include <asm/types.h>
+#include <linux/types.h>
#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
# define __SWAB_64_THRU_32__