From bbc3ae0f8d4cbd3db273dfc2cd8226769423d2cb Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Date: Sun, 20 Sep 2009 15:09:26 +0530
Subject: [PATCH] --- yaml --- r: 163887 b: refs/heads/master c:
 144374dcc3ad0436f0a1bb3095836cf0ec32eebe h: refs/heads/master i:   163885:
 ab3a1a65315c359814d0413bebbb838fc43a9dbd   163883:
 3d176efd24f9c291dbbf907209746e914c631e3e   163879:
 d660639aa5073ec19989c46afeb24c6f10cf90e0   163871:
 89c2d07ba3e8ae509ee581fe47611d29b8b2c0db v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/traps.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

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);