Merge branch 'linus' into core/debug

Conflicts:
	lib/vsprintf.c

Manual merge:

	include/linux/kernel.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 17 insertions, 16 deletions

diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index 597e47f5d69c..aa773a658a2a 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -253,7 +253,7 @@ static struct tuner_params *simple_tuner_params(struct dvb_frontend *fe,
 
 static int simple_config_lookup(struct dvb_frontend *fe,
                                 struct tuner_params *t_params,
-                                int *frequency, u8 *config, u8 *cb)
+                                unsigned *frequency, u8 *config, u8 *cb)
 {
         struct tuner_simple_priv *priv = fe->tuner_priv;
         int i;
@@ -587,45 +587,45 @@ static int simple_set_tv_freq(struct dvb_frontend *fe,
         priv->last_div = div;
         if (t_params->has_tda9887) {
                 struct v4l2_priv_tun_config tda9887_cfg;
-                int config = 0;
+                int tda_config = 0;
                 int is_secam_l = (params->std & (V4L2_STD_SECAM_L |
                                                  V4L2_STD_SECAM_LC)) &&
                         !(params->std & ~(V4L2_STD_SECAM_L |
                                           V4L2_STD_SECAM_LC));
 
                 tda9887_cfg.tuner = TUNER_TDA9887;
-                tda9887_cfg.priv  = &config;
+                tda9887_cfg.priv  = &tda_config;
 
                 if (params->std == V4L2_STD_SECAM_LC) {
                         if (t_params->port1_active ^ t_params->port1_invert_for_secam_lc)
-                                config |= TDA9887_PORT1_ACTIVE;
+                                tda_config |= TDA9887_PORT1_ACTIVE;
                         if (t_params->port2_active ^ t_params->port2_invert_for_secam_lc)
-                                config |= TDA9887_PORT2_ACTIVE;
+                                tda_config |= TDA9887_PORT2_ACTIVE;
                 } else {
                         if (t_params->port1_active)
-                                config |= TDA9887_PORT1_ACTIVE;
+                                tda_config |= TDA9887_PORT1_ACTIVE;
                         if (t_params->port2_active)
-                                config |= TDA9887_PORT2_ACTIVE;
+                                tda_config |= TDA9887_PORT2_ACTIVE;
                 }
                 if (t_params->intercarrier_mode)
-                        config |= TDA9887_INTERCARRIER;
+                        tda_config |= TDA9887_INTERCARRIER;
                 if (is_secam_l) {
                         if (i == 0 && t_params->default_top_secam_low)
-                                config |= TDA9887_TOP(t_params->default_top_secam_low);
+                                tda_config |= TDA9887_TOP(t_params->default_top_secam_low);
                         else if (i == 1 && t_params->default_top_secam_mid)
-                                config |= TDA9887_TOP(t_params->default_top_secam_mid);
+                                tda_config |= TDA9887_TOP(t_params->default_top_secam_mid);
                         else if (t_params->default_top_secam_high)
-                                config |= TDA9887_TOP(t_params->default_top_secam_high);
+                                tda_config |= TDA9887_TOP(t_params->default_top_secam_high);
                 } else {
                         if (i == 0 && t_params->default_top_low)
-                                config |= TDA9887_TOP(t_params->default_top_low);
+                                tda_config |= TDA9887_TOP(t_params->default_top_low);
                         else if (i == 1 && t_params->default_top_mid)
-                                config |= TDA9887_TOP(t_params->default_top_mid);
+                                tda_config |= TDA9887_TOP(t_params->default_top_mid);
                         else if (t_params->default_top_high)
-                                config |= TDA9887_TOP(t_params->default_top_high);
+                                tda_config |= TDA9887_TOP(t_params->default_top_high);
                 }
                 if (t_params->default_pll_gating_18)
-                        config |= TDA9887_GATING_18;
+                        tda_config |= TDA9887_GATING_18;
                 i2c_clients_command(priv->i2c_props.adap, TUNER_SET_CONFIG,
                                     &tda9887_cfg);
         }
@@ -813,7 +813,8 @@ static u32 simple_dvb_configure(struct dvb_frontend *fe, u8 *buf,
         static struct tuner_params *t_params;
         u8 config, cb;
         u32 div;
-        int ret, frequency = params->frequency / 62500;
+        int ret;
+        unsigned frequency = params->frequency / 62500;
 
         t_params = simple_tuner_params(fe, TUNER_PARAM_TYPE_DIGITAL);
         ret = simple_config_lookup(fe, t_params, &frequency, &config, &cb);