Merge tag 'afs-next-20180208' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...

[sfrench/cifs-2.6.git] / drivers / media / firewire / firedtv-fe.c

diff --git a/drivers/media/firewire/firedtv-fe.c b/drivers/media/firewire/firedtv-fe.c
index 17acda6bcb6eef0763330e566b4c1c9a444ce5a1..a2ef4ede8ebed061dd2b8396b5eb08f96b9abde7 100644 (file)
--- a/drivers/media/firewire/firedtv-fe.c
+++ b/drivers/media/firewire/firedtv-fe.c
@@ -16,7 +16,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 
-#include <dvb_frontend.h>
+#include <media/dvb_frontend.h>
 
 #include "firedtv.h"
 
@@ -165,7 +165,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
        ops->read_snr                   = fdtv_read_snr;
        ops->read_ucblocks              = fdtv_read_uncorrected_blocks;
 
-       ops->diseqc_send_master_cmd     = fdtv_diseqc_send_master_cmd;
+       ops->diseqc_send_master_cmd     = fdtv_diseqc_send_master_cmd;
        ops->diseqc_send_burst          = fdtv_diseqc_send_burst;
        ops->set_tone                   = fdtv_set_tone;
        ops->set_voltage                = fdtv_set_voltage;
@@ -220,7 +220,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
                fi->symbol_rate_min     = 870000;
                fi->symbol_rate_max     = 6900000;
 
-               fi->caps                = FE_CAN_INVERSION_AUTO |
+               fi->caps                = FE_CAN_INVERSION_AUTO |
                                          FE_CAN_QAM_16         |
                                          FE_CAN_QAM_32         |
                                          FE_CAN_QAM_64         |
@@ -236,7 +236,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
                fi->frequency_max       = 861000000;
                fi->frequency_stepsize  = 62500;
 
-               fi->caps                = FE_CAN_INVERSION_AUTO         |
+               fi->caps                = FE_CAN_INVERSION_AUTO         |
                                          FE_CAN_FEC_2_3                |
                                          FE_CAN_TRANSMISSION_MODE_AUTO |
                                          FE_CAN_GUARD_INTERVAL_AUTO    |