3 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gv100/mc_gv100.c b/drivers/gpu/nvgpu/gv100/mc_gv100.c
index a3f8ab06..5848a180 100644
--- a/drivers/gpu/nvgpu/gv100/mc_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/mc_gv100.c
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <linux/types.h>
+#include <nvgpu/types.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
index d0dfebcf..d27239ae 100644
--- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
@@ -202,7 +202,7 @@ static const struct __nvlink_reginit __nvlink_reginit_per_link_gpu[] = {
 
 #define NVL_DEVICE(str) nvlinkip_discovery_common_device_##str##_v()
 
-const char * __gv100_device_type_to_str(u32 type)
+static const char *__gv100_device_type_to_str(u32 type)
 {
         if (type == NVL_DEVICE(ioctrl))
                 return "IOCTRL";
@@ -1259,7 +1259,7 @@ static void gv100_nvlink_nvlipt_intr_enable(struct gk20a *g, u32 link_id,
 /*
  * Per-link NVLIPT ISR handler
  */
-bool gv100_nvlink_nvlipt_isr(struct gk20a *g, u32 link_id)
+static bool gv100_nvlink_nvlipt_isr(struct gk20a *g, u32 link_id)
 {
         /*
          * Interrupt handling happens in leaf handlers. Assume all interrupts
diff --git a/drivers/gpu/nvgpu/gv100/pmu_gv100.c b/drivers/gpu/nvgpu/gv100/pmu_gv100.c
index 113e554b..9317f6b4 100644
--- a/drivers/gpu/nvgpu/gv100/pmu_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/pmu_gv100.c
@@ -25,6 +25,7 @@
 #include <nvgpu/pmu.h>
 
 #include "gk20a/gk20a.h"
+#include "gv100/pmu_gv100.h"
 
 int gv100_pmu_init_acr(struct gk20a *g)
 {