diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-27 11:00:40 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-27 11:00:40 -0300 |
| commit | 4eebc35e388d275870454a6d509fefd629e98d98 (patch) | |
| tree | 3deb2eadb129c37dc3d5e97178158b078ec1a6b5 /linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | |
| parent | 8b3ea3121de2ffb49fa878bf4307dce49d74bd81 (diff) | |
| parent | 2fc29f23f48a916f556d40ce8498ed27a0b1f0fc (diff) | |
| download | mediapointer-dvb-s2-4eebc35e388d275870454a6d509fefd629e98d98.tar.gz mediapointer-dvb-s2-4eebc35e388d275870454a6d509fefd629e98d98.tar.bz2 | |
Merge from http://linuxtv.org/hg/~mcisely/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c index 2d97653d5..fc9d76792 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c @@ -28,6 +28,8 @@ #include "pvrusb2-tuner.h" #include "pvrusb2-demod.h" #include "pvrusb2-video-v4l.h" +#include "pvrusb2-cx2584x-v4l.h" +#include "pvrusb2-wm8775.h" #define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__) @@ -69,18 +71,26 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) return; } } + if (id == I2C_DRIVERID_CX25840) { + if (pvr2_i2c_cx2584x_v4l_setup(hdw,cp)) { + return; + } + } + if (id == I2C_DRIVERID_WM8775) { + if (pvr2_i2c_wm8775_setup(hdw,cp)) { + return; + } + } if (id == I2C_DRIVERID_SAA711X) { if (pvr2_i2c_decoder_v4l_setup(hdw,cp)) { return; } } -#ifdef PVR2_ENABLE_DRIVERID_TDA9887 if (id == I2C_DRIVERID_TDA9887) { if (pvr2_i2c_demod_setup(hdw,cp)) { return; } } -#endif } |