5 files changed, 7 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
index 384fbdef..b4a1f6f4 100644
--- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
@@ -25,6 +25,7 @@
 #include <trace/events/gk20a.h>
 
 #include <nvgpu/timers.h>
+#include <nvgpu/nvgpu_common.h>
 
 #include "gk20a.h"
 #include "channel_gk20a.h"
@@ -34,7 +35,6 @@
 #include "gr_gk20a.h"
 #include "debug_gk20a.h"
 #include "semaphore_gk20a.h"
-#include "nvgpu_common.h"
 
 #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index f3ccd613..ee6586ae 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -42,11 +42,11 @@
 #include <linux/sched.h>
 #include <linux/version.h>
 
+#include <nvgpu/nvgpu_common.h>
 #include <nvgpu/allocator.h>
 #include <nvgpu/timers.h>
 
 #include "gk20a.h"
-#include "nvgpu_common.h"
 #include "debug_gk20a.h"
 #include "ctrl_gk20a.h"
 #include "channel_sync_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
index e651ad2e..7342cb1d 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
@@ -3,7 +3,7 @@
  *
  * GK20A Graphics Context
  *
- * Copyright (c) 2011-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2017, 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,9 +21,10 @@
 
 #include <linux/firmware.h>
 
+#include <nvgpu/nvgpu_common.h>
+
 #include "gk20a.h"
 #include "gr_ctx_gk20a.h"
-#include "nvgpu_common.h"
 
 #include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 5802cb68..cddb3316 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -32,6 +32,7 @@
 #include <trace/events/gk20a.h>
 
 #include <nvgpu/timers.h>
+#include <nvgpu/nvgpu_common.h>
 
 #include "gk20a.h"
 #include "kind_gk20a.h"
@@ -43,7 +44,6 @@
 #include "semaphore_gk20a.h"
 #include "platform_gk20a.h"
 #include "ctxsw_trace_gk20a.h"
-#include "nvgpu_common.h"
 
 #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 0a2d36fe..9924e48f 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -24,12 +24,12 @@
 #include <linux/dma-mapping.h>
 #include <linux/uaccess.h>
 
+#include <nvgpu/nvgpu_common.h>
 #include <nvgpu/timers.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"
 #include "semaphore_gk20a.h"
-#include "nvgpu_common.h"
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>