diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-12-19 12:37:24 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-12-19 12:37:24 +0100 |
| commit | 6b7dcb536e3535444c39286333f10d06d2f44fb5 (patch) | |
| tree | 6a4c1e30e5900626e506d46b100d21a2fcd59003 /drivers/media/dvb-frontends/rtl2832_sdr.h | |
| parent | Merge tag 'drm-misc-next-2017-12-14' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | Linux 4.15-rc4 (diff) | |
| download | linux-6b7dcb536e3535444c39286333f10d06d2f44fb5.tar.xz linux-6b7dcb536e3535444c39286333f10d06d2f44fb5.zip | |
BackMerge tag 'v4.15-rc4' into drm-next
Linux 4.15-rc4
Daniel requested it to fix some messy conflicts.
Diffstat (limited to 'drivers/media/dvb-frontends/rtl2832_sdr.h')
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2832_sdr.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.h b/drivers/media/dvb-frontends/rtl2832_sdr.h index d8fc7e7212e3..8f88c2fb8627 100644 --- a/drivers/media/dvb-frontends/rtl2832_sdr.h +++ b/drivers/media/dvb-frontends/rtl2832_sdr.h @@ -33,15 +33,11 @@ * struct rtl2832_sdr_platform_data - Platform data for the rtl2832_sdr driver * @clk: Clock frequency (4000000, 16000000, 25000000, 28800000). * @tuner: Used tuner model. - * @i2c_client: rtl2832 demod driver I2C client. - * @bulk_read: rtl2832 driver private I/O interface. - * @bulk_write: rtl2832 driver private I/O interface. - * @update_bits: rtl2832 driver private I/O interface. + * @regmap: pointer to &struct regmap. * @dvb_frontend: rtl2832 DVB frontend. * @v4l2_subdev: Tuner v4l2 controls. * @dvb_usb_device: DVB USB interface for USB streaming. */ - struct rtl2832_sdr_platform_data { u32 clk; /* |