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 branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx18
/
cx18-ioctl.c
diff --git
a/drivers/media/video/cx18/cx18-ioctl.c
b/drivers/media/video/cx18/cx18-ioctl.c
index
d679240
..
7150195
100644
(file)
--- a/
drivers/media/video/cx18/cx18-ioctl.c
+++ b/
drivers/media/video/cx18/cx18-ioctl.c
@@
-40,7
+40,6
@@
#include "cx18-av-core.h"
#include <media/tveeprom.h>
#include <media/v4l2-chip-ident.h>
-#include <linux/i2c-id.h>
u16 cx18_service2vbi(int type)
{