diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-19 11:27:28 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-19 11:27:28 -0300 |
| commit | 9000c5024269dbd6f01e6cab6d8eaeb9f90b240f (patch) | |
| tree | 1c93ab6550a3bd97f73dcbcec36b28024e3254e5 /linux/drivers/media/video/mxb.c | |
| parent | cff8dc200a5b837ab3961fc7077c3125d65c2fb2 (diff) | |
| parent | ef8a1e833862b224fbe194505d8a619ad1b13b92 (diff) | |
| download | mediapointer-dvb-s2-9000c5024269dbd6f01e6cab6d8eaeb9f90b240f.tar.gz mediapointer-dvb-s2-9000c5024269dbd6f01e6cab6d8eaeb9f90b240f.tar.bz2 | |
Merge from http://linuxtv.org/hg/~mkrufky/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/mxb.c')
| -rw-r--r-- | linux/drivers/media/video/mxb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c index cedefda72..ac1c22ef7 100644 --- a/linux/drivers/media/video/mxb.c +++ b/linux/drivers/media/video/mxb.c @@ -200,13 +200,13 @@ static int mxb_probe(struct saa7146_dev* dev) /* loop through all i2c-devices on the bus and look who is there */ list_for_each(item,&mxb->i2c_adapter.clients) { client = list_entry(item, struct i2c_client, list); - if( I2C_TEA6420_1 == client->addr ) + if( I2C_ADDR_TEA6420_1 == client->addr ) mxb->tea6420_1 = client; - if( I2C_TEA6420_2 == client->addr ) + if( I2C_ADDR_TEA6420_2 == client->addr ) mxb->tea6420_2 = client; if( I2C_TEA6415C_2 == client->addr ) mxb->tea6415c = client; - if( I2C_TDA9840 == client->addr ) + if( I2C_ADDR_TDA9840 == client->addr ) mxb->tda9840 = client; if( I2C_SAA7111 == client->addr ) mxb->saa7111a = client; |