diff --git a/[refs] b/[refs]
index a2851e4d12d6..0fe523efbdb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 694dca2b80d5e17f5edddacf4fcdacc1091623f2
+refs/heads/master: 1b1b8d7841684d9d6273c479abe39d517dfb8cb8
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index dd4e5adefd8f..38913519a818 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h
@@ -68,9 +68,11 @@ struct pvr2_device_desc {
 	   was initialized from internal ROM. */
 	struct pvr2_string_table fx2_firmware;
 
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
 	/* callback functions to handle attachment of digital tuner & demod */
 	struct pvr2_dvb_props *dvb_props;
 
+#endif
 	/* Initial standard bits to use for this device, if not zero.
 	   Anything set here is also implied as an available standard.
 	   Note: This is ignored if overridden on the module load line via