diff options
author | Mike Isely <isely@pobox.com> | 2008-03-28 04:43:45 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:09:48 -0400 |
commit | 1b1b8d7841684d9d6273c479abe39d517dfb8cb8 (patch) | |
tree | 07288e8fa9c7ff7103b47e82ba1f127acadb701b /drivers/media | |
parent | 694dca2b80d5e17f5edddacf4fcdacc1091623f2 (diff) |
V4L/DVB (7704): pvrusb2: Fix slop involving use of struct which might not be defined
When the DVB interface is not compiled, the pvr2_dvb_props struct is
not available - so it really should be ifdef'ed out as well. This
didn't cause an error because in this context its usage was as an
opaque pointer. But it really shouldn't be present at all if DVB is
not enabled.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h index dd4e5adefd8f..38913519a818 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h | |||
@@ -68,9 +68,11 @@ struct pvr2_device_desc { | |||
68 | was initialized from internal ROM. */ | 68 | was initialized from internal ROM. */ |
69 | struct pvr2_string_table fx2_firmware; | 69 | struct pvr2_string_table fx2_firmware; |
70 | 70 | ||
71 | #ifdef CONFIG_VIDEO_PVRUSB2_DVB | ||
71 | /* callback functions to handle attachment of digital tuner & demod */ | 72 | /* callback functions to handle attachment of digital tuner & demod */ |
72 | struct pvr2_dvb_props *dvb_props; | 73 | struct pvr2_dvb_props *dvb_props; |
73 | 74 | ||
75 | #endif | ||
74 | /* Initial standard bits to use for this device, if not zero. | 76 | /* Initial standard bits to use for this device, if not zero. |
75 | Anything set here is also implied as an available standard. | 77 | Anything set here is also implied as an available standard. |
76 | Note: This is ignored if overridden on the module load line via | 78 | Note: This is ignored if overridden on the module load line via |