vserver 1.9.3

[linux-2.6.git] / drivers / media / video / saa7134 / saa7134-i2c.c

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index cc1aaaa..7dc44ea 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -327,8 +327,10 @@ static int attach_inform(struct i2c_client *client)
 {
         struct saa7134_dev *dev = client->adapter->algo_data;
        int tuner = dev->tuner_type;
+       int conf  = dev->tda9887_conf;
 
        saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&tuner);
+       saa7134_i2c_call_clients(dev,TDA9887_SET_CONFIG,&conf);
         return 0;
 }
 
@@ -347,8 +349,8 @@ static struct i2c_adapter saa7134_adap_template = {
        .inc_use       = inc_use,
        .dec_use       = dec_use,
 #endif
-#ifdef I2C_ADAP_CLASS_TV_ANALOG
-       .class         = I2C_ADAP_CLASS_TV_ANALOG,
+#ifdef I2C_CLASS_TV_ANALOG
+       .class         = I2C_CLASS_TV_ANALOG,
 #endif
        I2C_DEVNAME("saa7134"),
        .id            = I2C_ALGO_SAA7134,