diff --git a/[refs] b/[refs]
index 977ce39efddc..d7483ad80b37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edf382bc6d4429d796fc3b26f7a33eaeca9db8ec
+refs/heads/master: 144374dcc3ad0436f0a1bb3095836cf0ec32eebe
diff --git a/trunk/arch/x86/kernel/traps.c b/trunk/arch/x86/kernel/traps.c
index 7dc0de9d1ed9..9346e102338d 100644
--- a/trunk/arch/x86/kernel/traps.c
+++ b/trunk/arch/x86/kernel/traps.c
@@ -65,7 +65,6 @@
 #else
 #include <asm/processor-flags.h>
 #include <asm/setup.h>
-#include <asm/traps.h>
 
 asmlinkage int system_call(void);