diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 2e220028aad2..a7e00f8938f8 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h | |||
@@ -622,7 +622,7 @@ struct ivtv { | |||
622 | struct v4l2_subdev *sd_video; /* controlling video decoder subdev */ | 622 | struct v4l2_subdev *sd_video; /* controlling video decoder subdev */ |
623 | struct v4l2_subdev *sd_audio; /* controlling audio subdev */ | 623 | struct v4l2_subdev *sd_audio; /* controlling audio subdev */ |
624 | struct v4l2_subdev *sd_muxer; /* controlling audio muxer subdev */ | 624 | struct v4l2_subdev *sd_muxer; /* controlling audio muxer subdev */ |
625 | u32 base_addr; /* PCI resource base address */ | 625 | resource_size_t base_addr; /* PCI resource base address */ |
626 | volatile void __iomem *enc_mem; /* pointer to mapped encoder memory */ | 626 | volatile void __iomem *enc_mem; /* pointer to mapped encoder memory */ |
627 | volatile void __iomem *dec_mem; /* pointer to mapped decoder memory */ | 627 | volatile void __iomem *dec_mem; /* pointer to mapped decoder memory */ |
628 | volatile void __iomem *reg_mem; /* pointer to mapped registers */ | 628 | volatile void __iomem *reg_mem; /* pointer to mapped registers */ |