projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.37-rc7' into devicetree/next
[cascardo/linux.git]
/
drivers
/
media
/
video
/
s2255drv.c
diff --git
a/drivers/media/video/s2255drv.c
b/drivers/media/video/s2255drv.c
index
f5a46c4
..
a845753
100644
(file)
--- a/
drivers/media/video/s2255drv.c
+++ b/
drivers/media/video/s2255drv.c
@@
-49,7
+49,6
@@
#include <linux/videodev2.h>
#include <linux/version.h>
#include <linux/mm.h>
-#include <linux/smp_lock.h>
#include <media/videobuf-vmalloc.h>
#include <media/v4l2-common.h>
#include <media/v4l2-device.h>