From e2e139972723e1f72ab9f9fb8447eb6f600e6896 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 28 Sep 2006 13:48:26 -0300
Subject: [PATCH] --- yaml --- r: 38263 b: refs/heads/master c:
 dcc29cbcec8c8482eea249030e0aa65b7451073d h: refs/heads/master i:   38261:
 b5149636256dd24631a5455572c582c4c4d61a40   38259:
 b96c0334278be0dd3df51813fd2d98c74722bce3   38255:
 bbb751eb7fb9df81b01c8a60789de78fbc980710 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/videodev2.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 46da4630dd4a..7b89cff7b2f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92b2db08b1150576d295ba9440e172675095c3ae
+refs/heads/master: dcc29cbcec8c8482eea249030e0aa65b7451073d
diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h
index 253a7ed3abb3..c5fdf6259548 100644
--- a/trunk/include/linux/videodev2.h
+++ b/trunk/include/linux/videodev2.h
@@ -276,6 +276,8 @@ struct v4l2_fmtdesc
 
 #define V4L2_FMT_FLAG_COMPRESSED 0x0001
 
+#if 1
+	/* Experimental Frame Size and frame rate enumeration */
 /*
  *	F R A M E   S I Z E   E N U M E R A T I O N
  */
@@ -348,6 +350,7 @@ struct v4l2_frmivalenum
 
 	__u32	reserved[2];			/* Reserved space for future use */
 };
+#endif
 
 /*
  *	T I M E C O D E
@@ -1322,8 +1325,10 @@ struct v4l2_streamparm
 #define VIDIOC_G_EXT_CTRLS	_IOWR ('V', 71, struct v4l2_ext_controls)
 #define VIDIOC_S_EXT_CTRLS	_IOWR ('V', 72, struct v4l2_ext_controls)
 #define VIDIOC_TRY_EXT_CTRLS	_IOWR ('V', 73, struct v4l2_ext_controls)
+#if 1
 #define VIDIOC_ENUM_FRAMESIZES	_IOWR ('V', 74, struct v4l2_frmsizeenum)
 #define VIDIOC_ENUM_FRAMEINTERVALS	_IOWR ('V', 75, struct v4l2_frmivalenum)
+#endif
 
 #ifdef __OLD_VIDIOC_
 /* for compatibility, will go away some day */