From bb752d4900074eda2e3a860f695e7cffa6c5321b Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 2 Jun 2008 15:46:51 -0300 Subject: [PATCH] --- yaml --- r: 97737 b: refs/heads/master c: 39028ec69b13712ec1dcd9aa14844bf60f19cb20 h: refs/heads/master i: 97735: e544e3aabb0dc4d6421dd766572bd075bc73ba33 v: v3 --- [refs] | 2 +- trunk/include/linux/videodev2.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d6e8d6e1c028..720683841477 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c663d03590a882f4834197bff278ca0aa2a95e2e +refs/heads/master: 39028ec69b13712ec1dcd9aa14844bf60f19cb20 diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h index c1411189ba6c..4a535ea1e123 100644 --- a/trunk/include/linux/videodev2.h +++ b/trunk/include/linux/videodev2.h @@ -865,9 +865,9 @@ struct v4l2_querymenu #define V4L2_CID_HFLIP (V4L2_CID_BASE+20) #define V4L2_CID_VFLIP (V4L2_CID_BASE+21) -/* Deprecated, use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */ -#define V4L2_CID_HCENTER_DEPRECATED (V4L2_CID_BASE+22) -#define V4L2_CID_VCENTER_DEPRECATED (V4L2_CID_BASE+23) +/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */ +#define V4L2_CID_HCENTER (V4L2_CID_BASE+22) +#define V4L2_CID_VCENTER (V4L2_CID_BASE+23) #define V4L2_CID_POWER_LINE_FREQUENCY (V4L2_CID_BASE+24) enum v4l2_power_line_frequency {