diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 14:40:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 14:40:53 -0300 |
| commit | 82fac24573672f22d2c906f30045a40740ad8370 (patch) | |
| tree | 91cb00e21714e810361156db40214ef2d8855771 /linux/drivers | |
| parent | c1034f41946b80aa096d24cee63fee87af09c2b4 (diff) | |
| parent | 377d2c457826859f77eeac172a0c037298a87148 (diff) | |
| download | mediapointer-dvb-s2-82fac24573672f22d2c906f30045a40740ad8370.tar.gz mediapointer-dvb-s2-82fac24573672f22d2c906f30045a40740ad8370.tar.bz2 | |
Merge mkrufky tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv0297.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv0297.c b/linux/drivers/media/dvb/frontends/stv0297.c index 00bd2118b..54f4414a7 100644 --- a/linux/drivers/media/dvb/frontends/stv0297.c +++ b/linux/drivers/media/dvb/frontends/stv0297.c @@ -393,10 +393,6 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par break; case QAM_128: - delay = 150; - sweeprate = 1000; - break; - case QAM_256: delay = 200; sweeprate = 500; diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index d15bac0fd..c2eb5b3ea 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1500,7 +1500,7 @@ void cx88_card_setup(struct cx88_core *core) if (0 == core->i2c_rc) { /* enable tuner */ int i; - u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 }; + static const u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 }; core->i2c_client.addr = 0x0a; for (i = 0; i < 5; i++) diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 3963ac2d1..17f71932a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -3596,7 +3596,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) { /* enable tuner */ int i; - u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 }; + static const u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 }; dev->i2c_client.addr = 0x0a; for (i = 0; i < 5; i++) if (2 != i2c_master_send(&dev->i2c_client,&buffer[i*2],2)) |