diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-05 09:44:26 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-05 09:44:26 +0000 |
| commit | beda7f49d19164696901cf82198d4d2dd28533c1 (patch) | |
| tree | 8892b27c8d911da30d9bb859045ed4e92555d917 /linux/drivers | |
| parent | 7f67f137dcb611632511eeba0187a5976b13e258 (diff) | |
| download | mediapointer-dvb-s2-beda7f49d19164696901cf82198d4d2dd28533c1.tar.gz mediapointer-dvb-s2-beda7f49d19164696901cf82198d4d2dd28533c1.tar.bz2 | |
- Fixes compilation problems due removal of media/id.h and I2C_ALGO_BIT
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cs53l32a.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/video/wm8775.c | 14 |
2 files changed, 11 insertions, 13 deletions
diff --git a/linux/drivers/media/video/cs53l32a.c b/linux/drivers/media/video/cs53l32a.c index d090307af..acda1581e 100644 --- a/linux/drivers/media/video/cs53l32a.c +++ b/linux/drivers/media/video/cs53l32a.c @@ -27,9 +27,9 @@ #include <linux/ioctl.h> #include <asm/uaccess.h> #include <linux/i2c.h> +#include <linux/i2c-id.h> #include <linux/videodev.h> #include <media/audiochip.h> -#include <media/id.h> MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC"); MODULE_AUTHOR("Martin Vaughan"); @@ -207,7 +207,13 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, static int cs53l32a_probe(struct i2c_adapter *adapter) { - return i2c_probe(adapter, &addr_data, cs53l32a_attach); +#ifdef I2C_CLASS_TV_ANALOG + if (adapter->class & I2C_CLASS_TV_ANALOG) +#else + if (adapter->id == I2C_HW_B_BT848) +#endif + return i2c_probe(adapter, &addr_data, cs53l32a_attach); + return 0; } static int cs53l32a_detach(struct i2c_client *client) diff --git a/linux/drivers/media/video/wm8775.c b/linux/drivers/media/video/wm8775.c index 3813c01e0..4e60142ed 100644 --- a/linux/drivers/media/video/wm8775.c +++ b/linux/drivers/media/video/wm8775.c @@ -28,9 +28,9 @@ #include <linux/ioctl.h> #include <asm/uaccess.h> #include <linux/i2c.h> +#include <linux/i2c-id.h> #include <linux/videodev.h> #include <media/audiochip.h> -#include <media/id.h> MODULE_DESCRIPTION("wm8775 driver"); MODULE_AUTHOR("Ulf Eklund"); @@ -217,18 +217,10 @@ static int wm8775_probe(struct i2c_adapter *adapter) { #ifdef I2C_CLASS_TV_ANALOG if (adapter->class & I2C_CLASS_TV_ANALOG) - return i2c_probe(adapter, &addr_data, wm8775_attach); -#else - switch (adapter->id) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) - case I2C_HW_B_BT848: #else - case I2C_ALGO_BIT | I2C_HW_B_BT848: + if (adapter->id == I2C_HW_B_BT848) #endif - return i2c_probe(adapter, &addr_data, tda9887_attach); - } -#endif /* I2C_CLASS_TV_ANALOG */ - + return i2c_probe(adapter, &addr_data, wm8775_attach); return 0; } |