summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 18:14:57 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 18:14:57 -0300
commit6d2a77ee876428f13d4e34ecc252fa6ca4f3997a (patch)
treed785775d46700b6aace81d867bdd963bd5a528ef /linux/include
parent00ac7fc0004f2e088ae6fa1657735105e50968b5 (diff)
parent44643ca470044ddd9b01cf78c51ec22b1e0494a7 (diff)
downloadmediapointer-dvb-s2-6d2a77ee876428f13d4e34ecc252fa6ca4f3997a.tar.gz
mediapointer-dvb-s2-6d2a77ee876428f13d4e34ecc252fa6ca4f3997a.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/fusionhdtv7
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/videodev2.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index 5359c2c76..c6cffb912 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -866,9 +866,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 {