git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git...
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
apm_32.c
diff --git
a/arch/x86/kernel/apm_32.c
b/arch/x86/kernel/apm_32.c
index
732d1f4
..
5145a6e
100644
(file)
--- a/
arch/x86/kernel/apm_32.c
+++ b/
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>