summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/mxb.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-03-18 19:57:19 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2006-03-18 19:57:19 +0100
commit0befda04446c7f6c4bb400db7406acc4aa38376f (patch)
treeb1f0de63fb67473cea6ba54ff06f00c26442e1d7 /linux/drivers/media/video/mxb.c
parent853281d7ac18c7e109231a4d86a9565623531de2 (diff)
parent2d0abb67a8d568f7bfd5ae1814cf1f34757237da (diff)
downloadmediapointer-dvb-s2-0befda04446c7f6c4bb400db7406acc4aa38376f.tar.gz
mediapointer-dvb-s2-0befda04446c7f6c4bb400db7406acc4aa38376f.tar.bz2
Merge from master
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/mxb.c')
-rw-r--r--linux/drivers/media/video/mxb.c6
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;