Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/x86

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

diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
index b37d59d..15821ab 100644 (file)
--- a/include/media/tuner-types.h
+++ b/include/media/tuner-types.h
@@ -19,7 +19,6 @@ struct tuner_range {
 
 struct tuner_params {
        enum param_type type;
-       unsigned int tda988x;
        /* Many Philips based tuners have a comment like this in their
         * datasheet:
         *
@@ -31,7 +30,8 @@ struct tuner_params {
         *   will result in very low tuning voltage which may drive the
         *   oscillator to extreme conditions.
         *
-        * Set this flag to 1 if this tuner needs this check.
+        * 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
         * 203 MHz and then switching to 96.6 MHz FM radio. The result was