Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

[mv-sheeva.git] / include / linux / videodev2.h

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 3689d7d81fe9975b1a51ee544a6adfdc1dc25c95..b59e78c57161451049500609fe40b432dc18a7f0 100644 (file)
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -910,9 +910,10 @@ enum v4l2_colorfx {
        V4L2_COLORFX_SEPIA      = 2,
 };
 #define V4L2_CID_AUTOBRIGHTNESS                        (V4L2_CID_BASE+32)
+#define V4L2_CID_BAND_STOP_FILTER              (V4L2_CID_BASE+33)
 
 /* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+33)
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+34)
 
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE                     (V4L2_CTRL_CLASS_MPEG | 0x900)