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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
saa7110.c
diff --git
a/drivers/media/video/saa7110.c
b/drivers/media/video/saa7110.c
index
41d951d
..
676b997
100644
(file)
--- a/
drivers/media/video/saa7110.c
+++ b/
drivers/media/video/saa7110.c
@@
-43,6
+43,7
@@
MODULE_LICENSE("GPL");
#define I2C_NAME(s) (s)->name
#include <linux/videodev.h>
+#include <media/v4l2-common.h>
#include <linux/video_decoder.h>
static int debug = 0;