git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[sfrench/cifs-2.6.git]
/
arch
/
i386
/
mach-visws
/
visws_apic.c
diff --git
a/arch/i386/mach-visws/visws_apic.c
b/arch/i386/mach-visws/visws_apic.c
index 38c2b13124d92c0861211866d40cdf7adda3146a..710faf71a650b11a991cdbc034cb21e31f0a98f1 100644
(file)
--- a/
arch/i386/mach-visws/visws_apic.c
+++ b/
arch/i386/mach-visws/visws_apic.c
@@
-18,7
+18,6
@@
#include <linux/kernel_stat.h>
#include <linux/interrupt.h>
-#include <linux/smp_lock.h>
#include <linux/init.h>
#include <asm/io.h>