Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6

[powerpc.git] / drivers / media / video / tuner-3036.c

diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index bedb15e..7920359 100644 (file)
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -35,15 +35,12 @@ static struct i2c_client client_template;
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END };
-static unsigned short probe[2]        = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2]       = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2]        = { I2C_CLIENT_END, I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
 
 static struct i2c_client_address_data addr_data = {
        .normal_i2c     = normal_i2c,
-       .probe          = probe,
-       .ignore         = ignore,
-       .force          = force,
+       .probe          = &ignore,
+       .ignore         = &ignore,
 };
 
 /* ---------------------------------------------------------------------- */
@@ -154,7 +151,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
        switch (cmd) 
        {
-               case TUNER_SET_TVFREQ:
+               case VIDIOCSFREQ:
                        set_tv_freq(client, *iarg);
                        break;
            
@@ -168,7 +165,7 @@ static int
 tuner_probe(struct i2c_adapter *adap)
 {
        this_adap = 0;
-       if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_LP))
+       if (adap->id == I2C_HW_B_LP)
                return i2c_probe(adap, &addr_data, tuner_attach);
        return 0;
 }