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/common | |
| 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/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c index a1dedcae8..086774b00 100644 --- a/linux/drivers/media/common/saa7146_i2c.c +++ b/linux/drivers/media/common/saa7146_i2c.c @@ -409,14 +409,14 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c if( NULL != i2c_adapter ) { memset(i2c_adapter,0,sizeof(struct i2c_adapter)); - strcpy(i2c_adapter->name, dev->name); #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) + strcpy(i2c_adapter->name, dev->name); i2c_adapter->data = dev; - i2c_adapter->algo = &saa7146_algo; #else strcpy(i2c_adapter->dev.name, dev->name); i2c_set_adapdata(i2c_adapter,dev); #endif + i2c_adapter->algo = &saa7146_algo; i2c_adapter->algo_data = NULL; i2c_adapter->id = I2C_ALGO_SAA7146; i2c_adapter->timeout = SAA7146_I2C_TIMEOUT; |