[media] V4L: Remove "_ACTIVE" from the selection target name definitions

[firefly-linux-kernel-4.4.55.git] / include / linux / videodev2.h

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index a61edb353273114125c6367473be49426dc97c92..ac1ad33ba3e0b1850e994ac0534afa363d88504c 100644 (file)
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -767,13 +767,13 @@ struct v4l2_crop {
 /* Selection targets */
 
 /* Current cropping area */
-#define V4L2_SEL_TGT_CROP_ACTIVE       0x0000
+#define V4L2_SEL_TGT_CROP              0x0000
 /* Default cropping area */
 #define V4L2_SEL_TGT_CROP_DEFAULT      0x0001
 /* Cropping bounds */
 #define V4L2_SEL_TGT_CROP_BOUNDS       0x0002
 /* Current composing area */
-#define V4L2_SEL_TGT_COMPOSE_ACTIVE    0x0100
+#define V4L2_SEL_TGT_COMPOSE           0x0100
 /* Default composing area */
 #define V4L2_SEL_TGT_COMPOSE_DEFAULT   0x0101
 /* Composing bounds */
@@ -781,6 +781,10 @@ struct v4l2_crop {
 /* Current composing area plus all padding pixels */
 #define V4L2_SEL_TGT_COMPOSE_PADDED    0x0103
 
+/* Backward compatibility definitions */
+#define V4L2_SEL_TGT_CROP_ACTIVE       V4L2_SEL_TGT_CROP
+#define V4L2_SEL_TGT_COMPOSE_ACTIVE    V4L2_SEL_TGT_COMPOSE
+
 /**
  * struct v4l2_selection - selection info
  * @type:      buffer type (do not use *_MPLANE types)