git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
stv680.c
diff --git
a/drivers/media/video/stv680.c
b/drivers/media/video/stv680.c
index
75f286f
..
8b4e7da
100644
(file)
--- a/
drivers/media/video/stv680.c
+++ b/
drivers/media/video/stv680.c
@@
-62,6
+62,7
@@
#include <linux/init.h>
#include <linux/vmalloc.h>
#include <linux/slab.h>
+#include <linux/smp_lock.h>
#include <linux/pagemap.h>
#include <linux/errno.h>
#include <linux/videodev.h>