summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-04-01 20:36:50 -0600
committerMike Isely <isely@pobox.com>2006-04-01 20:36:50 -0600
commitcbea0cdfe46b67fb696b0a045e8ace7dddf4ca49 (patch)
treec560570ce6cc4ad649aeb87c16900f4b913c1b31 /linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
parent0bce98602d455b54f9e8f4915f7288e0b4b6bdb8 (diff)
downloadmediapointer-dvb-s2-cbea0cdfe46b67fb696b0a045e8ace7dddf4ca49.tar.gz
mediapointer-dvb-s2-cbea0cdfe46b67fb696b0a045e8ace7dddf4ca49.tar.bz2
Split out PVR USB2 model 24xxx hardware support to a config option
From: Mike Isely <isely@pobox.com> Since there are lingering stability problems with support of the newer PVR USB2 model 24xxx series hardware, I have isolate those changes with a config option. This commit leaves that option off. Signed-off-by: Mike Isely <isely@pobox.com>
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.c4
1 files changed, 4 insertions, 0 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 fc9d76792..89d0da053 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -28,8 +28,10 @@
#include "pvrusb2-tuner.h"
#include "pvrusb2-demod.h"
#include "pvrusb2-video-v4l.h"
+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX
#include "pvrusb2-cx2584x-v4l.h"
#include "pvrusb2-wm8775.h"
+#endif
#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)
@@ -71,6 +73,7 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
return;
}
}
+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX
if (id == I2C_DRIVERID_CX25840) {
if (pvr2_i2c_cx2584x_v4l_setup(hdw,cp)) {
return;
@@ -81,6 +84,7 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
return;
}
}
+#endif
if (id == I2C_DRIVERID_SAA711X) {
if (pvr2_i2c_decoder_v4l_setup(hdw,cp)) {
return;