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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[sfrench/cifs-2.6.git]
/
drivers
/
ieee1394
/
video1394.c
diff --git
a/drivers/ieee1394/video1394.c
b/drivers/ieee1394/video1394.c
index 95ca26d7527297354021b2b18b2e89637c53dc7b..87ebd0846c3410d56afbc520180046322bc44cdc 100644
(file)
--- a/
drivers/ieee1394/video1394.c
+++ b/
drivers/ieee1394/video1394.c
@@
-39,7
+39,6
@@
#include <linux/pci.h>
#include <linux/fs.h>
#include <linux/poll.h>
-#include <linux/smp_lock.h>
#include <linux/delay.h>
#include <linux/bitops.h>
#include <linux/types.h>