diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
| commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
| tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /drivers/media/dvb-frontends/rtl2832.h | |
| parent | 5e54b3c1202765ae62de24a160f1eaf6b0ebf9d4 (diff) | |
| parent | f335195adf043168ee69d78ea72ac3e30f0c57ce (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/dvb-frontends/rtl2832.h')
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2832.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/rtl2832.h b/drivers/media/dvb-frontends/rtl2832.h index 03c0de039fa9..6a124ff71c2b 100644 --- a/drivers/media/dvb-frontends/rtl2832.h +++ b/drivers/media/dvb-frontends/rtl2832.h @@ -35,7 +35,6 @@ * @pid_filter: Set PID to PID filter. * @pid_filter_ctrl: Control PID filter. */ - struct rtl2832_platform_data { u32 clk; /* |