diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c index fbe6039aeb6a..ed3e8105292a 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | |||
@@ -26,10 +26,8 @@ | |||
26 | #include "pvrusb2-audio.h" | 26 | #include "pvrusb2-audio.h" |
27 | #include "pvrusb2-tuner.h" | 27 | #include "pvrusb2-tuner.h" |
28 | #include "pvrusb2-video-v4l.h" | 28 | #include "pvrusb2-video-v4l.h" |
29 | #ifdef CONFIG_VIDEO_PVRUSB2_24XXX | ||
30 | #include "pvrusb2-cx2584x-v4l.h" | 29 | #include "pvrusb2-cx2584x-v4l.h" |
31 | #include "pvrusb2-wm8775.h" | 30 | #include "pvrusb2-wm8775.h" |
32 | #endif | ||
33 | 31 | ||
34 | #define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__) | 32 | #define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__) |
35 | 33 | ||
@@ -71,7 +69,6 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) | |||
71 | return; | 69 | return; |
72 | } | 70 | } |
73 | } | 71 | } |
74 | #ifdef CONFIG_VIDEO_PVRUSB2_24XXX | ||
75 | if (id == I2C_DRIVERID_CX25840) { | 72 | if (id == I2C_DRIVERID_CX25840) { |
76 | if (pvr2_i2c_cx2584x_v4l_setup(hdw,cp)) { | 73 | if (pvr2_i2c_cx2584x_v4l_setup(hdw,cp)) { |
77 | return; | 74 | return; |
@@ -82,7 +79,6 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) | |||
82 | return; | 79 | return; |
83 | } | 80 | } |
84 | } | 81 | } |
85 | #endif | ||
86 | if (id == I2C_DRIVERID_SAA711X) { | 82 | if (id == I2C_DRIVERID_SAA711X) { |
87 | if (pvr2_i2c_decoder_v4l_setup(hdw,cp)) { | 83 | if (pvr2_i2c_decoder_v4l_setup(hdw,cp)) { |
88 | return; | 84 | return; |