Merge branch 'fixes-rc1' into omap-for-v4.2/fixes

[firefly-linux-kernel-4.4.55.git] / drivers / media / pci / pt1 / va1j5jf8007t.c

diff --git a/drivers/media/pci/pt1/va1j5jf8007t.c b/drivers/media/pci/pt1/va1j5jf8007t.c
index 2db15159d514daf498791e668a4eab8cd1a91c7d..0268f20b8097137e3f705b86ab8631baee7ccbf8 100644 (file)
--- a/drivers/media/pci/pt1/va1j5jf8007t.c
+++ b/drivers/media/pci/pt1/va1j5jf8007t.c
@@ -98,7 +98,7 @@ static int va1j5jf8007t_get_frontend_algo(struct dvb_frontend *fe)
 }
 
 static int
-va1j5jf8007t_read_status(struct dvb_frontend *fe, fe_status_t *status)
+va1j5jf8007t_read_status(struct dvb_frontend *fe, enum fe_status *status)
 {
        struct va1j5jf8007t_state *state;
 
@@ -266,7 +266,7 @@ static int
 va1j5jf8007t_tune(struct dvb_frontend *fe,
                  bool re_tune,
                  unsigned int mode_flags,  unsigned int *delay,
-                 fe_status_t *status)
+                 enum fe_status *status)
 {
        struct va1j5jf8007t_state *state;
        int ret;