diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
commit | 7ad3423ebb02f340671f70a916bdc8dbec7573ee (patch) | |
tree | b9168d363c24f2af2626e63011ec1f6c81e81d09 /drivers/media/dvb-frontends/rtl2830.h | |
parent | 56a23ee52611ca76421f3d7cac100e1616716dae (diff) | |
parent | 44be77c590f381bc629815ac789b8b15ecc4ddcf (diff) | |
download | talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.tar.gz talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.zip |
Merge branch 'for-linus' into for-next
Back-merge the upstream branch for applying further cleanup patches
for HD-Audio.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/media/dvb-frontends/rtl2830.h')
-rw-r--r-- | drivers/media/dvb-frontends/rtl2830.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/rtl2830.h b/drivers/media/dvb-frontends/rtl2830.h index 0cde151e6608..458ac94e8a8b 100644 --- a/drivers/media/dvb-frontends/rtl2830.h +++ b/drivers/media/dvb-frontends/rtl2830.h @@ -32,7 +32,6 @@ * @pid_filter: Set PID to PID filter. * @pid_filter_ctrl: Control PID filter. */ - struct rtl2830_platform_data { u32 clk; bool spec_inv; |