Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[powerpc.git] / include / media / tuner-types.h

diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
index 9f0e9c1..ad9c171 100644 (file)
--- a/include/media/tuner-types.h
+++ b/include/media/tuner-types.h
@@ -14,12 +14,12 @@ enum param_type {
 
 struct tuner_range {
        unsigned short limit;
+       unsigned char config;
        unsigned char cb;
 };
 
 struct tuner_params {
        enum param_type type;
-       unsigned int tda988x;
        /* Many Philips based tuners have a comment like this in their
         * datasheet:
         *
@@ -31,7 +31,7 @@ struct tuner_params {
         *   will result in very low tuning voltage which may drive the
         *   oscillator to extreme conditions.
         *
-        * Set cb_first_if_lower_freq to 1, if this check is 
+        * Set cb_first_if_lower_freq to 1, if this check is
         * required for this tuner.
         *
         * I tested this for PAL by first setting the TV frequency to
@@ -39,7 +39,6 @@ struct tuner_params {
         * static unless the control byte was sent first.
         */
        unsigned int cb_first_if_lower_freq:1;
-       unsigned char config; /* to be moved into struct tuner_range for dvb-pll merge */
 
        unsigned int count;
        struct tuner_range *ranges;
@@ -47,6 +46,7 @@ struct tuner_params {
 
 struct tunertype {
        char *name;
+       unsigned int count;
        struct tuner_params *params;
 };