vserver 1.9.3

[linux-2.6.git] / drivers / media / dvb / frontends / stv0299.c

diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index c6a98de..17c1dd3 100644 (file)
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -319,7 +319,7 @@ static int stv0299_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
 static int pll_write (struct dvb_i2c_bus *i2c, u8 addr, u8 *data, int len)
 {
        int ret;
-       struct i2c_msg msg = { addr: addr, .flags = 0, .buf = data, .len = len };
+       struct i2c_msg msg = { .addr = addr, .buf = data, .len = len };
 
 
        stv0299_writereg(i2c, 0x05, 0xb5);      /*  enable i2c repeater on stv0299  */
@@ -1257,12 +1257,12 @@ static long probe_tuner (struct dvb_i2c_bus *i2c)
         u8 stat [] = { 0 };
        u8 tda6100_buf [] = { 0, 0 };
        int ret;
-       struct i2c_msg msg1 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt,  len: 2 },
+       struct i2c_msg msg1 [] = {{ .addr = 0x68, .buf = rpt,  .len = 2 },
                           { .addr = 0x60, .flags = I2C_M_RD, .buf = stat, .len = 1 }};
-       struct i2c_msg msg2 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt,  len: 2 },
+       struct i2c_msg msg2 [] = {{ .addr = 0x68, .buf = rpt,  .len = 2 },
                           { .addr = 0x61, .flags = I2C_M_RD, .buf = stat, .len = 1 }};
-       struct i2c_msg msg3 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt,  len: 2 },
-                          { .addr = 0x60, .flags = 0, .buf = tda6100_buf, .len = 2 }};
+       struct i2c_msg msg3 [] = {{ .addr = 0x68, .buf = rpt,  .len = 2 },
+                          { .addr = 0x60, .buf = tda6100_buf, .len = 2 }};
 
        stv0299_writereg (i2c, 0x01, 0x15);
        stv0299_writereg (i2c, 0x02, 0x30);
@@ -1271,7 +1271,7 @@ static long probe_tuner (struct dvb_i2c_bus *i2c)
 
        printk ("%s: try to attach to %s\n", __FUNCTION__, adapter->name);
 
-       if ( strcmp(adapter->name, "Technisat SkyStar2 driver") == 0 )
+       if ( strcmp(adapter->name, "SkyStar2") == 0 )
        {
            printk ("%s: setup for tuner Samsung TBMU24112IMB\n", __FILE__);