diff options
| author | Michael Hunold <devnull@localhost> | 2004-04-06 13:05:23 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2004-04-06 13:05:23 +0000 |
| commit | 0149a7612bb6d15c611176cdbbd557b2303315c5 (patch) | |
| tree | 7622bd2bfc563beaa7c335dbbbd159fac4ab7d30 /linux/drivers/media/common | |
| parent | 996ab91ff4d4a2ff552bb461cb213d47d957d88a (diff) | |
| download | mediapointer-dvb-s2-0149a7612bb6d15c611176cdbbd557b2303315c5.tar.gz mediapointer-dvb-s2-0149a7612bb6d15c611176cdbbd557b2303315c5.tar.bz2 | |
- introduce new class variable, sets the i2c adapter class for 2.6 (unused for 2.4)
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_i2c.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c index 699fedd32..6e991a90f 100644 --- a/linux/drivers/media/common/saa7146_i2c.c +++ b/linux/drivers/media/common/saa7146_i2c.c @@ -400,7 +400,7 @@ static struct i2c_algorithm saa7146_algo = { .functionality = saa7146_i2c_func, }; -int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate) +int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, unsigned int class, u32 bitrate) { DEB_EE(("bitrate: 0x%08x\n",bitrate)); @@ -414,19 +414,16 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c memset(i2c_adapter,0,sizeof(struct i2c_adapter)); strcpy(i2c_adapter->name, dev->name); #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - i2c_adapter->data = dev; + i2c_adapter->data = dev; #else i2c_set_adapdata(i2c_adapter,dev); + i2c_adapter->class = class; #endif i2c_adapter->algo = &saa7146_algo; i2c_adapter->algo_data = NULL; i2c_adapter->id = I2C_ALGO_SAA7146; i2c_adapter->timeout = SAA7146_I2C_TIMEOUT; i2c_adapter->retries = SAA7146_I2C_RETRIES; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#else - i2c_adapter->class = I2C_ADAP_CLASS_TV_ANALOG; -#endif } return 0; |