diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig
index 8c1faaeaa..b753ce22f 100755
--- a/drivers/gpu/arm/Kconfig
+++ b/drivers/gpu/arm/Kconfig
@@ -22,8 +22,7 @@ menu "ARM GPU Configuration"
 
 choice
 	prompt "Mali Version Configuration"
-	default MALI_DDK_VALHALL_R32P1 if $(PLATFORM_VERSION_FOR_GPU) = 12
-	default MALI_DDK_VALHALL_R32P1 if $(PLATFORM_VERSION_FOR_GPU) >= 13
+	default MALI_DDK_VALHALL_R32P1
 	help
 	  Select Mali GPU driver version.
 
@@ -36,9 +35,6 @@ config MALI_DDK_VALHALL_R26P0
 config MALI_DDK_VALHALL_R32P1
 	bool "Valhall r32p1 driver"
 
-config MALI_DDK_VALHALL_R38P1
-	bool "Valhall r38p1 driver"
-
 endchoice
 
 if MALI_DDK_VALHALL_R26P0
@@ -49,8 +45,4 @@ if MALI_DDK_VALHALL_R32P1
 source "drivers/gpu/arm/bv_r32p1/Kconfig"
 endif
 
-if MALI_DDK_VALHALL_R38P1
-source "drivers/gpu/arm/bv_r38p1/Kconfig"
-endif
-
 endmenu
diff --git a/drivers/sensorhub/vendor/Kconfig b/drivers/sensorhub/vendor/Kconfig
index 3fa7ade9d..99c05a6d6 100755
--- a/drivers/sensorhub/vendor/Kconfig
+++ b/drivers/sensorhub/vendor/Kconfig
@@ -4,4 +4,5 @@ config SHUB_MTK
 
 config SHUB_LSI
 	tristate "lsi sensorhub"
-	default y
\ No newline at end of file
+	default y
+
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 87be94565..cd9c81f50 100755
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -615,7 +615,9 @@ static void
 destroy_conntrack(struct nf_conntrack *nfct)
 {
 	
+#ifdef CONFIG_KNOX_NCM
 	unsigned long flags;
+#endif
 	struct nf_conn *ct = (struct nf_conn *)nfct;
 
     // SEC_PRODUCT_FEATURE_KNOX_SUPPORT_NPA {
@@ -1581,7 +1583,9 @@ EXPORT_SYMBOL_GPL(nf_conntrack_alloc);
 void nf_conntrack_free(struct nf_conn *ct)
 {
 	
+#ifdef CONFIG_KNOX_NCM
 	unsigned long flags;
+#endif
 	struct net *net = nf_ct_net(ct);
 
 	/* A freed object has refcnt == 0, that's