Merge remote-tracking branch 'keys/keys-next'

[deliverable/linux.git] / drivers / media / platform / mtk-vcodec / mtk_vcodec_drv.h

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
index 94f0a425be42e93fe72979f242d8e68c6a7f5c62..c8eaa41c00e6c900afa29c563d2ffab9d31a885c 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
@@ -23,7 +23,6 @@
 #include <media/v4l2-ioctl.h>
 #include <media/videobuf2-core.h>
 
-#include "mtk_vcodec_util.h"
 
 #define MTK_VCODEC_DRV_NAME    "mtk_vcodec_drv"
 #define MTK_VCODEC_ENC_NAME    "mtk-vcodec-enc"
@@ -240,7 +239,7 @@ struct mtk_vcodec_ctx {
        enum mtk_encode_param param_change;
        struct mtk_enc_params enc_params;
 
-       struct venc_common_if *enc_if;
+       const struct venc_common_if *enc_if;
        unsigned long drv_handle;
 
        int int_cond;