diff --git a/config/gvmauto.conf b/config/gvmauto.conf
old mode 100755
new mode 100644
index a29d2538cbcb..1cdc7b30eddb
--- a/config/gvmauto.conf
+++ b/config/gvmauto.conf
@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (c) 2021, The Linux Foundation. All rights reserved.
+
+ifeq ($(CONFIG_QGKI), y)
 export CONFIG_SND_SOC_GVM_AUTO_SPF=m
 export CONFIG_MSM_QDSP6_APRV2_VM=m
 export CONFIG_MSM_QDSP6_SSR=m
@@ -15,3 +19,4 @@ export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
 export CONFIG_MSM_QDSP6V2_CODECS=m
 export CONFIG_SND_EVENT=m
 export CONFIG_SND_SOC_SA8155=m
+endif
\ No newline at end of file
diff --git a/include/soc/internal.h b/include/soc/internal.h
index 4b7332cb9758..2bc065526db0 120000
--- a/include/soc/internal.h
+++ b/include/soc/internal.h
@@ -1 +1 @@
-../../../../../../kernel/msm-5.4/drivers/base/regmap/internal.h
\ No newline at end of file
+../../../../drivers/base/regmap/internal.h
\ No newline at end of file