Merge branch 'core/header-fixes' into x86/headers

Conflicts: arch/x86/include/asm/setup.h
2009-02-13 21:05:03 +01:00
parent bf33a70a73 0fb807c3e5
commit 22796b1572
36 changed files with 100 additions and 86 deletions
--- 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
--- 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__