Merge git://git.infradead.org/mtd-2.6

[karo-tx-linux.git] / include / linux / videodev2.h

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 957d5b093847ba42d7f64e6b154c56082f2e3293..5f6f47044abfecffcb4cc8112e4b25996825f49b 100644 (file)
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -397,14 +397,6 @@ struct v4l2_frmsize_discrete {
        __u32                   height;         /* Frame height [pixel] */
 };
 
-struct v4l2_discrete_probe {
-       const struct v4l2_frmsize_discrete      *sizes;
-       int                                     num_sizes;
-};
-
-struct v4l2_frmsize_discrete *v4l2_find_nearest_format(struct v4l2_discrete_probe *probe,
-                                                      s32 width, s32 height);
-
 struct v4l2_frmsize_stepwise {
        __u32                   min_width;      /* Minimum frame width [pixel] */
        __u32                   max_width;      /* Maximum frame width [pixel] */
@@ -1376,6 +1368,8 @@ struct v4l2_modulator {
 #define V4L2_TUNER_CAP_SAP             0x0020
 #define V4L2_TUNER_CAP_LANG1           0x0040
 #define V4L2_TUNER_CAP_RDS             0x0080
+#define V4L2_TUNER_CAP_RDS_BLOCK_IO    0x0100
+#define V4L2_TUNER_CAP_RDS_CONTROLS    0x0200
 
 /*  Flags for the 'rxsubchans' field */
 #define V4L2_TUNER_SUB_MONO            0x0001
@@ -1405,7 +1399,8 @@ struct v4l2_hw_freq_seek {
        enum v4l2_tuner_type  type;
        __u32                 seek_upward;
        __u32                 wrap_around;
-       __u32                 reserved[8];
+       __u32                 spacing;
+       __u32                 reserved[7];
 };
 
 /*