summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2014-02-25 19:12:19 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-05 16:34:14 -0300
commitade48681f132188599c5cefa8a3287c2a26fb738 (patch)
tree3fbc34291e9556ad4f64982bf73801f533843b49 /include/media
parent939f1377fbdb5d0d6d6ee1e234b8ab9328ca77ef (diff)
downloadlinux-ade48681f132188599c5cefa8a3287c2a26fb738.tar.bz2
[media] v4l: Rename vb2_queue.timestamp_type as timestamp_flags
The timestamp_type field used to contain only the timestamp type. Soon it will be used for timestamp source flags as well. Rename the field accordingly. [m.chehab@samsung.com: do the change also to drivers/staging/media and at s2255] Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/videobuf2-core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index bef53ce555d2..3770be6e972d 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -342,7 +342,7 @@ struct vb2_queue {
const struct vb2_mem_ops *mem_ops;
void *drv_priv;
unsigned int buf_struct_size;
- u32 timestamp_type;
+ u32 timestamp_flags;
gfp_t gfp_flags;
/* private: internal use only */