aboutsummaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-13 21:05:03 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-13 21:05:03 +0100
commit22796b15725488002437ebbf98a22fdbe596cf89 (patch)
treee6745c9e367e782c0b184eb941e2b86805975f88 /arch/mips
parentbf33a70a73876b163d62612e9567cbac6604ba7e (diff)
parent0fb807c3e573ff9de2965ca38c907605d4735d16 (diff)
Merge branch 'core/header-fixes' into x86/headers
Conflicts: arch/x86/include/asm/setup.h
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/sigcontext.h1
-rw-r--r--arch/mips/include/asm/swab.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/include/asm/sigcontext.h b/arch/mips/include/asm/sigcontext.h
index 9ce0607d7a4..9e89cf99d4e 100644
--- a/arch/mips/include/asm/sigcontext.h
+++ b/arch/mips/include/asm/sigcontext.h
@@ -9,6 +9,7 @@
#ifndef _ASM_SIGCONTEXT_H
#define _ASM_SIGCONTEXT_H
+#include <linux/types.h>
#include <asm/sgidefs.h>
#if _MIPS_SIM == _MIPS_SIM_ABI32
diff --git a/arch/mips/include/asm/swab.h b/arch/mips/include/asm/swab.h
index 88f1f7d555c..99993c0d6c1 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__