diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs
index 9afab1a5f..940a164f6 100644
--- a/drivers/gpu/nvgpu/Makefile.linux.configs
+++ b/drivers/gpu/nvgpu/Makefile.linux.configs
@@ -202,7 +202,7 @@ endif
 
 # Set config for OOT module build
 ifeq ($(CONFIG_TEGRA_OOT_MODULE),m)
-CONFIG_GK20A_DEVFREQ := n
+CONFIG_GK20A_DEVFREQ := y
 CONFIG_GK20A_PM_QOS := n
 endif
 
diff --git a/drivers/gpu/nvgpu/os/linux/scale.c b/drivers/gpu/nvgpu/os/linux/scale.c
index b89928553..f78f99b1d 100644
--- a/drivers/gpu/nvgpu/os/linux/scale.c
+++ b/drivers/gpu/nvgpu/os/linux/scale.c
@@ -1,7 +1,7 @@
 /*
  * gk20a clock scaling profile
  *
- * Copyright (c) 2013-2021, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2013-2022, NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -21,10 +21,14 @@
 #include <linux/devfreq_cooling.h>
 #endif
 #include <linux/export.h>
+#ifdef CONFIG_GK20A_PM_QOS
 #include <linux/pm_qos.h>
+#endif
 #include <linux/version.h>
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 14, 0)
 #include <governor.h>
+#endif
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
@@ -403,7 +407,9 @@ void gk20a_scale_init(struct device *dev)
 		return;
 
 	profile->dev = dev;
+#ifdef CONFIG_GK20A_PM_QOS
 	profile->dev_stat.busy = false;
+#endif
 
 	/* Create frequency table */
 	err = gk20a_scale_make_freq_table(profile);