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 rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
cx25840
/
cx25840-vbi.c
diff --git
a/drivers/media/video/cx25840/cx25840-vbi.c
b/drivers/media/video/cx25840/cx25840-vbi.c
index 04d879da7d63f9e3ecc6094bec9d08662d184d43..57feca288d2bad25635254ee186bd296014d2040 100644
(file)
--- a/
drivers/media/video/cx25840/cx25840-vbi.c
+++ b/
drivers/media/video/cx25840/cx25840-vbi.c
@@
-19,8
+19,9
@@
#include <linux/videodev2.h>
#include <linux/i2c.h>
#include <media/v4l2-common.h>
+#include <media/cx25840.h>
-#include "cx25840.h"
+#include "cx25840
-core
.h"
static int odd_parity(u8 c)
{