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
/
powerpc
/
platforms
/
iseries
/
viopath.c
diff --git
a/arch/powerpc/platforms/iseries/viopath.c
b/arch/powerpc/platforms/iseries/viopath.c
index 2ca2d8a9de97ac5bcf23148e62141df6978f069b..354b8dd2a2c1e2ccdf515e164c26fcf571c232fe 100644
(file)
--- a/
arch/powerpc/platforms/iseries/viopath.c
+++ b/
arch/powerpc/platforms/iseries/viopath.c
@@
-36,7
+36,6
@@
#include <linux/dma-mapping.h>
#include <linux/wait.h>
#include <linux/seq_file.h>
-#include <linux/smp_lock.h>
#include <linux/interrupt.h>
#include <asm/system.h>