diff options
| author | Michael Hunold <devnull@localhost> | 2003-04-28 17:53:36 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-04-28 17:53:36 +0000 |
| commit | e1399ab6e7a98aafcabc260a30cccf1fa59666dd (patch) | |
| tree | 9324ac2aa8ef45098e51f5041c4381af3aac7852 /linux/drivers/media/video/saa7111.c | |
| parent | cf56c58ffc026357baf1820ea2b467ff06e42027 (diff) | |
| download | mediapointer-dvb-s2-e1399ab6e7a98aafcabc260a30cccf1fa59666dd.tar.gz mediapointer-dvb-s2-e1399ab6e7a98aafcabc260a30cccf1fa59666dd.tar.bz2 | |
Compile fixes against 2.5.68.
- add some ifdef magic into i2c drivers (mxb/analog drivers only)
- shuffle around includes, so that "dvb_compat.h" is included after
all other include files
- fix a warning in saa7146 i2c code
Diffstat (limited to 'linux/drivers/media/video/saa7111.c')
| -rw-r--r-- | linux/drivers/media/video/saa7111.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7111.c b/linux/drivers/media/video/saa7111.c index cac5ddd99..b25b64bfc 100644 --- a/linux/drivers/media/video/saa7111.c +++ b/linux/drivers/media/video/saa7111.c @@ -121,7 +121,7 @@ static int saa7111_attach(struct i2c_adapter *adap, int addr, unsigned short fla memset(decoder, 0, sizeof(*decoder)); decoder->client = client; - client->data = decoder; + i2c_set_clientdata(client, decoder); decoder->addr = addr; decoder->norm = VIDEO_MODE_NTSC; decoder->input = 0; @@ -163,8 +163,13 @@ static int saa7111_probe(struct i2c_adapter *adap) return -ENODEV; } +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) printk("saa7111: probing %s i2c adapter [id=0x%x]\n", adap->name,adap->id); +#else + printk("saa7111: probing %s i2c adapter [id=0x%x]\n", + adap->dev.name,adap->id); +#endif return i2c_probe(adap, &addr_data, saa7111_attach); } |