diff options
| author | Mike Isely <isely@pobox.com> | 2006-09-02 13:56:33 -0500 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-09-02 13:56:33 -0500 |
| commit | fd2e835028e83542e4656d6a2ec821337e8125e3 (patch) | |
| tree | 4fef3de96b73cbe44244a4ddedb390ea71bec917 /linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | |
| parent | ee1d769d6482d4eb10103e06598fdae347a9fd19 (diff) | |
| download | mediapointer-dvb-s2-fd2e835028e83542e4656d6a2ec821337e8125e3.tar.gz mediapointer-dvb-s2-fd2e835028e83542e4656d6a2ec821337e8125e3.tar.bz2 | |
Remove CONFIG_VIDEO_PVRUSB2_24XXX from pvrusb2 driver
From: Mike Isely <isely@pobox.com>
Support for 24xxx devices was previously explicitly bracketed with
CONFIG_VIDEO_PVRUSB2_24XXX inside the code because we didn't trust the
stability of these changes. We trust it now; so there's no reason to
leave this out of the driver anymore.
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.c | 4 |
1 files changed, 0 insertions, 4 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 db80b1aa3..99daf3c1f 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c @@ -27,10 +27,8 @@ #include "pvrusb2-audio.h" #include "pvrusb2-tuner.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__) @@ -72,7 +70,6 @@ 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; @@ -83,7 +80,6 @@ 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; |