From d2abe59dae3c43d46b8f97eb8664a5467711eeda Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Wed, 20 Aug 2008 16:43:07 -0700
Subject: [PATCH] --- yaml --- r: 110363 b: refs/heads/master c:
 4e1d112cac08049e764fe3c4f6d3ec92529f9f68 h: refs/heads/master i:   110361:
 abfb3b1855392a8cfedc3921cd881924d4aaffb5   110359:
 43ff18f3429fadd342662503b3a3645970a350f6 v: v3

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

diff --git a/[refs] b/[refs]
index c3d8b1df4e6a..ecf64df0dcf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d96ae6b0dc03a568398c1655fb8967f01f8e40a
+refs/heads/master: 4e1d112cac08049e764fe3c4f6d3ec92529f9f68
diff --git a/trunk/arch/x86/kernel/apm_32.c b/trunk/arch/x86/kernel/apm_32.c
index 9ee24e6bc4b0..b93d069aea72 100644
--- a/trunk/arch/x86/kernel/apm_32.c
+++ b/trunk/arch/x86/kernel/apm_32.c
@@ -228,7 +228,6 @@
 #include <linux/suspend.h>
 #include <linux/kthread.h>
 #include <linux/jiffies.h>
-#include <linux/smp_lock.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>