diff options
| author | Mike Isely <isely@pobox.com> | 2006-09-02 14:56:33 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 11:30:35 -0400 |
| commit | 7f19d0278c86c7f27df287fd0bd5170fe75dc7d2 (patch) | |
| tree | a3ff18cd443d79615fb23b748e4563a91c666907 /drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | |
| parent | 4d31256f378e1a5fca7f4f3fb8b0a0aa1fff4312 (diff) | |
V4L/DVB (4595): Remove CONFIG_VIDEO_PVRUSB2_24XXX from pvrusb2 driver
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h index 74c125ad407..34b08fbcc6e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | |||
| @@ -168,9 +168,7 @@ struct pvr2_decoder_ctrl { | |||
| 168 | 168 | ||
| 169 | /* Known major hardware variants, keyed from device ID */ | 169 | /* Known major hardware variants, keyed from device ID */ |
| 170 | #define PVR2_HDW_TYPE_29XXX 0 | 170 | #define PVR2_HDW_TYPE_29XXX 0 |
| 171 | #ifdef CONFIG_VIDEO_PVRUSB2_24XXX | ||
| 172 | #define PVR2_HDW_TYPE_24XXX 1 | 171 | #define PVR2_HDW_TYPE_24XXX 1 |
| 173 | #endif | ||
| 174 | 172 | ||
| 175 | typedef int (*pvr2_i2c_func)(struct pvr2_hdw *,u8,u8 *,u16,u8 *, u16); | 173 | typedef int (*pvr2_i2c_func)(struct pvr2_hdw *,u8,u8 *,u16,u8 *, u16); |
| 176 | #define PVR2_I2C_FUNC_CNT 128 | 174 | #define PVR2_I2C_FUNC_CNT 128 |