summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-driver.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-06-20 05:16:46 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-06-20 05:16:46 -0300
commitbd150f373b325df62dd8e55a4c188874be6056f5 (patch)
treec6ff7a59ff8d9cf34294149e280fe9b3c600e855 /linux/drivers/media/video/ivtv/ivtv-driver.h
parentb41ba4a247b2332fef5507c4f58accb32e092802 (diff)
parent571714f552dabd4cba7f7693ec5ce5464b443ea7 (diff)
downloadmediapointer-dvb-s2-bd150f373b325df62dd8e55a4c188874be6056f5.tar.gz
mediapointer-dvb-s2-bd150f373b325df62dd8e55a4c188874be6056f5.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/trivial
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-driver.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h
index 7b162e415..54648ee73 100644
--- a/linux/drivers/media/video/ivtv/ivtv-driver.h
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.h
@@ -657,7 +657,6 @@ struct vbi_info {
/* convenience pointer to sliced struct in vbi_in union */
struct v4l2_sliced_vbi_format *sliced_in;
u32 service_set_in;
- u32 service_set_out;
int insert_mpeg;
/* Buffer for the maximum of 2 * 18 * packet_size sliced VBI lines.