---

yaml
---
r: 333771
b: refs/heads/master
c: 3cfee2d
h: refs/heads/master
i:
  333769: c8c6f11
  333767: c9f0864
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 822f0fd36281c0d56501d6153d10555dc2e2ba52
+refs/heads/master: 3cfee2daf9fe9dc514c29f7e7fb35c17136771d2

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 */