From 179dece7eddaecf1f2840d0859e024dbff269e17 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 30 Jul 2012 05:08:47 -0300 Subject: [PATCH] --- yaml --- r: 330554 b: refs/heads/master c: 660e22c7b008f1b21283cc2d786b2dd7c7790440 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/v4l2-common.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a79c7c90d114..e572f7398803 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 076f0e359e308dae67821196f56d36d6648f9086 +refs/heads/master: 660e22c7b008f1b21283cc2d786b2dd7c7790440 diff --git a/trunk/include/linux/v4l2-common.h b/trunk/include/linux/v4l2-common.h index 0fa8b64c3cdb..4f0667e010dd 100644 --- a/trunk/include/linux/v4l2-common.h +++ b/trunk/include/linux/v4l2-common.h @@ -53,10 +53,10 @@ /* Backward compatibility target definitions --- to be removed. */ #define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP #define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE -#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL \ - V4L2_SEL_TGT_CROP -#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL \ - V4L2_SEL_TGT_COMPOSE +#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP +#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE +#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS +#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS /* Selection flags */ #define V4L2_SEL_FLAG_GE (1 << 0)