diff options
| author | Gerd Knorr <devnull@localhost> | 2004-06-08 10:19:13 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-06-08 10:19:13 +0000 |
| commit | adc3b362f0ea22b662813fb76cb6d7f71134c30b (patch) | |
| tree | 751841fbd4ddaf74386474338e7398031a5eb6eb /linux/drivers/media/video/saa7134 | |
| parent | a71510115b990965e7f6ecd6d233039a0d82507e (diff) | |
| download | mediapointer-dvb-s2-adc3b362f0ea22b662813fb76cb6d7f71134c30b.tar.gz mediapointer-dvb-s2-adc3b362f0ea22b662813fb76cb6d7f71134c30b.tar.bz2 | |
- update i2c stuff for the changes in upcoming 2.6.7
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa6752hs.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-i2c.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c index 2b707f50a..80b700d9d 100644 --- a/linux/drivers/media/video/saa7134/saa6752hs.c +++ b/linux/drivers/media/video/saa7134/saa6752hs.c @@ -352,8 +352,8 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, static int saa6752hs_probe(struct i2c_adapter *adap) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - if (adap->class & I2C_ADAP_CLASS_TV_ANALOG) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + if (adap->class & I2C_CLASS_TV_ANALOG) return i2c_probe(adap, &addr_data, saa6752hs_attach); #else switch (adap->id) { diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c index a1b8df331..b039c0385 100644 --- a/linux/drivers/media/video/saa7134/saa7134-i2c.c +++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c @@ -347,8 +347,8 @@ static struct i2c_adapter saa7134_adap_template = { .inc_use = inc_use, .dec_use = dec_use, #endif -#ifdef I2C_ADAP_CLASS_TV_ANALOG - .class = I2C_ADAP_CLASS_TV_ANALOG, +#ifdef I2C_CLASS_TV_ANALOG + .class = I2C_CLASS_TV_ANALOG, #endif I2C_DEVNAME("saa7134"), .id = I2C_ALGO_SAA7134, |