diff --git a/[refs] b/[refs]
index 649dd96d671c..ce0a19a93177 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 420ab35eef206d147973d26db14b5618868726be
+refs/heads/master: e59afe6a21dce7bb3c63ba4f894a3195ae3d5529
diff --git a/trunk/arch/x86/include/asm/sigcontext.h b/trunk/arch/x86/include/asm/sigcontext.h
index 0afcb5e58acc..ec666491aaa4 100644
--- a/trunk/arch/x86/include/asm/sigcontext.h
+++ b/trunk/arch/x86/include/asm/sigcontext.h
@@ -2,7 +2,7 @@
 #define _ASM_X86_SIGCONTEXT_H
 
 #include <linux/compiler.h>
-#include <asm/types.h>
+#include <linux/types.h>
 
 #define FP_XSTATE_MAGIC1	0x46505853U
 #define FP_XSTATE_MAGIC2	0x46505845U