diff --git a/drivers/gpu/nvgpu/common/pmu/acr_gm20b.c b/drivers/gpu/nvgpu/common/pmu/acr_gm20b.c
index e78b0136f..f77a79fce 100644
--- a/drivers/gpu/nvgpu/common/pmu/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/common/pmu/acr_gm20b.c
@@ -47,7 +47,8 @@
 #include <nvgpu/hw/gm20b/hw_falcon_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_pwr_gm20b.h>
 
-typedef int (*get_ucode_details)(struct gk20a *g, struct flcn_ucode_img *udata);
+typedef int (*gm20b_get_ucode_details)(struct gk20a *g,
+				       struct flcn_ucode_img *udata);
 
 /*Externs*/
 
@@ -69,7 +70,7 @@ static void lsfm_init_wpr_contents(struct gk20a *g, struct ls_flcn_mgr *plsfm,
 static void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr *plsfm);
 
 /*Globals*/
-static get_ucode_details pmu_acr_supp_ucode_list[] = {
+static gm20b_get_ucode_details pmu_acr_supp_ucode_list[] = {
 	pmu_ucode_details,
 	fecs_ucode_details,
 	gpccs_ucode_details,
diff --git a/drivers/gpu/nvgpu/common/pmu/acr_gp106.c b/drivers/gpu/nvgpu/common/pmu/acr_gp106.c
index e36769800..440799b87 100644
--- a/drivers/gpu/nvgpu/common/pmu/acr_gp106.c
+++ b/drivers/gpu/nvgpu/common/pmu/acr_gp106.c
@@ -50,8 +50,8 @@
 #define gp106_dbg_pmu(g, fmt, arg...) \
 	nvgpu_log(g, gpu_dbg_pmu, fmt, ##arg)
 
-typedef int (*get_ucode_details)(struct gk20a *g,
-		struct flcn_ucode_img_v1 *udata);
+typedef int (*gp106_get_ucode_details)(struct gk20a *g,
+				       struct flcn_ucode_img_v1 *udata);
 
 /* Both size and address of WPR need to be 128K-aligned */
 #define WPR_ALIGNMENT	0x20000
@@ -64,7 +64,7 @@ typedef int (*get_ucode_details)(struct gk20a *g,
 /*Forwards*/
 
 /*Globals*/
-static get_ucode_details pmu_acr_supp_ucode_list[] = {
+static gp106_get_ucode_details pmu_acr_supp_ucode_list[] = {
 	pmu_ucode_details,
 	fecs_ucode_details,
 	gpccs_ucode_details,