projects
/
linux-drm-fsl-dcu.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/herbert/crypto-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
sparc64
/
kernel
/
smp.c
diff --git
a/arch/sparc64/kernel/smp.c
b/arch/sparc64/kernel/smp.c
index 1fac215252e403bc25af1fbc3a58fe88e22e3994..8087d67a0cf8a31f155ae0dd39237e767b62305c 100644
(file)
--- a/
arch/sparc64/kernel/smp.c
+++ b/
arch/sparc64/kernel/smp.c
@@
-10,7
+10,6
@@
#include <linux/pagemap.h>
#include <linux/threads.h>
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
#include <linux/delay.h>