summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/swab.h
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-03-31 05:08:33 +0200
committerFelix Blyakher <felixb@sgi.com>2009-03-31 05:08:33 +0200
commit930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch)
treedf6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /arch/mips/include/asm/swab.h
parentxfs: increase the maximum number of supported ACL entries (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-930861c4e6f13ce2e7d06cd1ef11441a065517d9.tar.xz
linux-930861c4e6f13ce2e7d06cd1ef11441a065517d9.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/include/asm/swab.h')
-rw-r--r--arch/mips/include/asm/swab.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/swab.h b/arch/mips/include/asm/swab.h
index 88f1f7d555cb..99993c0d6c12 100644
--- a/arch/mips/include/asm/swab.h
+++ b/arch/mips/include/asm/swab.h
@@ -9,7 +9,7 @@
#define _ASM_SWAB_H
#include <linux/compiler.h>
-#include <asm/types.h>
+#include <linux/types.h>
#define __SWAB_64_THRU_32__