diff --git a/config/konavid.conf b/config/konavid.conf
index e43585c724ac..65eae99c590b 100644
--- a/config/konavid.conf
+++ b/config/konavid.conf
@@ -1,3 +1,5 @@
 ifeq ($(CONFIG_QGKI),y)
 export CONFIG_MSM_VIDC_V4L2=y
+else
+export CONFIG_MSM_VIDC_V4L2=m
 endif
diff --git a/msm/vidc/msm_v4l2_vidc.c b/msm/vidc/msm_v4l2_vidc.c
index 1d5f2755a0e6..b97fc88b8d26 100644
--- a/msm/vidc/msm_v4l2_vidc.c
+++ b/msm/vidc/msm_v4l2_vidc.c
@@ -733,4 +733,5 @@ static void __exit msm_vidc_exit(void)
 module_init(msm_vidc_init);
 module_exit(msm_vidc_exit);
 
+MODULE_SOFTDEP("pre: subsys-pil-tz");
 MODULE_LICENSE("GPL v2");
diff --git a/msm/vidc/msm_vidc_debug.c b/msm/vidc/msm_vidc_debug.c
index 00c1bccfb7c5..6628318482d1 100644
--- a/msm/vidc/msm_vidc_debug.c
+++ b/msm/vidc/msm_vidc_debug.c
@@ -8,7 +8,6 @@
 #define MAX_DEBUG_LEVEL_STRING_LEN 15
 #include "msm_vidc_debug.h"
 #include "vidc_hfi_api.h"
-#include <linux/of_fdt.h>
 
 int msm_vidc_debug = VIDC_ERR | VIDC_PRINTK |
 	FW_ERROR | FW_FATAL | FW_FTRACE;
diff --git a/msm/vidc/msm_vidc_platform.c b/msm/vidc/msm_vidc_platform.c
index d9491df8f6bc..92e120ba7628 100644
--- a/msm/vidc/msm_vidc_platform.c
+++ b/msm/vidc/msm_vidc_platform.c
@@ -6,7 +6,6 @@
 #include <linux/module.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
-#include <linux/of_fdt.h>
 #include "msm_vidc_internal.h"
 #include "msm_vidc_debug.h"
 
@@ -594,7 +593,7 @@ static struct msm_vidc_platform_data bengal_data = {
 	.codec_caps_count = ARRAY_SIZE(bengal_capabilities_v0),
 };
 
-static const struct of_device_id msm_vidc_dt_match[] = {
+static const struct of_device_id msm_vidc_dt_device[] = {
 	{
 		.compatible = "qcom,lahaina-vidc",
 		.data = &lahaina_data,
@@ -606,7 +605,7 @@ static const struct of_device_id msm_vidc_dt_match[] = {
 	{},
 };
 
-MODULE_DEVICE_TABLE(of, msm_vidc_dt_match);
+MODULE_DEVICE_TABLE(of, msm_vidc_dt_device);
 
 static int msm_vidc_read_rank(
 		struct msm_vidc_platform_data *data, struct device *dev)
@@ -635,7 +634,7 @@ void *vidc_get_drv_data(struct device *dev)
 		goto exit;
 	}
 
-	match = of_match_node(msm_vidc_dt_match, dev->of_node);
+	match = of_match_node(msm_vidc_dt_device, dev->of_node);
 
 	if (match)
 		driver_data = (struct msm_vidc_platform_data *)match->data;