diff options
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cs53l32a.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/video/wm8775.c | 14 | ||||
| -rw-r--r-- | v4l/ChangeLog | 13 | ||||
| -rw-r--r-- | v4l/Makefile | 2 |
5 files changed, 26 insertions, 15 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index 62076d297..57c9d631d 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -77,6 +77,6 @@ 76 -> SKNet MonsterTV Mobile [1131:4ee9] 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] 78 -> ASUSTeK P7131 Dual [1043:4862] - 79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B) + 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) 80 -> ASUS Digimatrix TV [1043:0210] 81 -> Philips Tiger reference design [1131:2018] 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; } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index c9bab2dca..a3294bbe4 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,16 @@ +2005-11-05 09:40 mchehab + + * ../linux/Documentation/video4linux/CARDLIST.saa7134: + * ../linux/drivers/media/video/cs53l32a.c: (cs53l32a_probe): + * ../linux/drivers/media/video/wm8775.c: (wm8775_probe): + * ../v4l/Makefile: + - Fixes compilation problems due removal of media/id.h and I2C_ALGO_BIT + - adds both modules to the inst_video list in the Makefile so that + they are installed. + + Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-11-05 03:04 rmcc * ../linux/drivers/media/video/saa7134/saa7134-cards.c: diff --git a/v4l/Makefile b/v4l/Makefile index 1e3bd021e..2ba2fe522 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -152,7 +152,7 @@ endif inst_common := ir-common.ko inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko saa6588.ko -inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko +inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko inst_video += video-buf.ko video-buf-dvb.ko inst_video += ir-kbd-gpio.ko ir-kbd-i2c.ko msp3400.ko inst_video += tvp5150.ko saa711x.ko |