From afd795c5866e4ab7ea3b3320654dbcacd537e8eb Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 20 Sep 2012 09:06:21 -0300 Subject: [PATCH] --- yaml --- r: 333771 b: refs/heads/master c: 3cfee2daf9fe9dc514c29f7e7fb35c17136771d2 h: refs/heads/master i: 333769: c8c6f11e244fcb2181ac84d9d7c2792ee5b62db6 333767: c9f086423c837d58190079a207646dfe9254eb90 v: v3 --- [refs] | 2 +- .../drivers/media/platform/davinci/vpif_display.h | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 6b0cecadbadd..0b051763d04d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 822f0fd36281c0d56501d6153d10555dc2e2ba52 +refs/heads/master: 3cfee2daf9fe9dc514c29f7e7fb35c17136771d2 diff --git a/trunk/drivers/media/platform/davinci/vpif_display.h b/trunk/drivers/media/platform/davinci/vpif_display.h index f628ebcf3674..b90a1640ce8c 100644 --- a/trunk/drivers/media/platform/davinci/vpif_display.h +++ b/trunk/drivers/media/platform/davinci/vpif_display.h @@ -65,12 +65,6 @@ struct video_obj { u32 output_id; /* Current output id */ }; -struct vbi_obj { - int num_services; - struct vpif_vbi_params vbiparams; /* vpif parameters for the raw - * vbi data */ -}; - struct vpif_disp_buffer { struct vb2_buffer vb; struct list_head list; @@ -136,7 +130,6 @@ struct channel_obj { struct vpif_params vpifparams; struct common_obj common[VPIF_NUMOBJECTS]; struct video_obj video; - struct vbi_obj vbi; }; /* File handle structure */ @@ -168,12 +161,4 @@ struct vpif_config_params { u8 min_numbuffers; }; -/* Struct which keeps track of the line numbers for the sliced vbi service */ -struct vpif_service_line { - u16 service_id; - u16 service_line[2]; - u16 enc_service_id; - u8 bytestowrite; -}; - #endif /* DAVINCIHD_DISPLAY_H */