From 3a4898bd97abefb872c5bd23b4b4233035ad1f8d Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 15 Feb 2013 14:51:23 -0300
Subject: [PATCH] --- yaml --- r: 366573 b: refs/heads/master c:
 4bd3bb7129ac9a0ee3ba4b587c228f5f43b841cd h: refs/heads/master i:   366571:
 55244666ce0b6eaefa2ebcfb12225101c7e7af81 v: v3

---
 [refs]                                               |  2 +-
 .../drivers/staging/media/davinci_vpfe/vpfe_video.c  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b01d0165cd47..ec942338bd8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 416d307651ffa035a1e9f5ccc9f915cb2235d415
+refs/heads/master: 4bd3bb7129ac9a0ee3ba4b587c228f5f43b841cd
diff --git a/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.c b/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 99ccbebea598..19dc5b062d07 100644
--- a/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -1016,12 +1016,12 @@ vpfe_query_dv_timings(struct file *file, void *fh,
 }
 
 /*
- * vpfe_s_dv_timings() - set dv_preset on external subdev
+ * vpfe_s_dv_timings() - set dv_timings on external subdev
  * @file: file pointer
  * @priv: void pointer
  * @timings: pointer to v4l2_dv_timings structure
  *
- * set dv_timings pointed by preset on external subdev through
+ * set dv_timings pointed by timings on external subdev through
  * v4l2_device_call_until_err, this configures amplifier also
  *
  * Return 0 on success, error code otherwise
@@ -1042,12 +1042,12 @@ vpfe_s_dv_timings(struct file *file, void *fh,
 }
 
 /*
- * vpfe_g_dv_timings() - get dv_preset which is set on external subdev
+ * vpfe_g_dv_timings() - get dv_timings which is set on external subdev
  * @file: file pointer
  * @priv: void pointer
  * @timings: pointer to v4l2_dv_timings structure
  *
- * get dv_preset which is set on external subdev through
+ * get dv_timings which is set on external subdev through
  * v4l2_subdev_call
  *
  * Return 0 on success, error code otherwise
@@ -1423,7 +1423,7 @@ static int vpfe_dqbuf(struct file *file, void *priv,
 }
 
 /*
- * vpfe_streamon() - get dv_preset which is set on external subdev
+ * vpfe_streamon() - start streaming
  * @file: file pointer
  * @priv: void pointer
  * @buf_type: enum v4l2_buf_type
@@ -1472,7 +1472,7 @@ static int vpfe_streamon(struct file *file, void *priv,
 }
 
 /*
- * vpfe_streamoff() - get dv_preset which is set on external subdev
+ * vpfe_streamoff() - stop streaming
  * @file: file pointer
  * @priv: void pointer
  * @buf_type: enum v4l2_buf_type