5 files changed, 9 insertions, 15 deletions

diff --git a/drivers/gpu/nvgpu/common/therm/therm.c b/drivers/gpu/nvgpu/common/therm/therm.c
index cfe8a2c1..8c88ff0d 100644
--- a/drivers/gpu/nvgpu/common/therm/therm.c
+++ b/drivers/gpu/nvgpu/common/therm/therm.c
@@ -23,8 +23,7 @@
 #include <nvgpu/types.h>
 #include <nvgpu/log.h>
 #include <nvgpu/therm.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 int nvgpu_init_therm_support(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/common/therm/therm_gm20b.c b/drivers/gpu/nvgpu/common/therm/therm_gm20b.c
index 023ec36a..925f6951 100644
--- a/drivers/gpu/nvgpu/common/therm/therm_gm20b.c
+++ b/drivers/gpu/nvgpu/common/therm/therm_gm20b.c
@@ -23,7 +23,7 @@
  */
 
 #include <nvgpu/io.h>
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "therm_gm20b.h"
 
diff --git a/drivers/gpu/nvgpu/common/therm/therm_gp106.c b/drivers/gpu/nvgpu/common/therm/therm_gp106.c
index b22cefeb..b1490613 100644
--- a/drivers/gpu/nvgpu/common/therm/therm_gp106.c
+++ b/drivers/gpu/nvgpu/common/therm/therm_gp106.c
@@ -21,8 +21,7 @@
  */
 
 #include <nvgpu/io.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "therm_gp106.h"
 #include "therm/thrmpmu.h"
diff --git a/drivers/gpu/nvgpu/common/therm/therm_gp10b.c b/drivers/gpu/nvgpu/common/therm/therm_gp10b.c
index 905ff178..8b5371a9 100644
--- a/drivers/gpu/nvgpu/common/therm/therm_gp10b.c
+++ b/drivers/gpu/nvgpu/common/therm/therm_gp10b.c
@@ -21,13 +21,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-#include "gk20a/gk20a.h"
-#include "therm_gp10b.h"
-
 #include <nvgpu/soc.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
+
+#include "therm_gp10b.h"
 
 #include <nvgpu/hw/gp10b/hw_therm_gp10b.h>
 
diff --git a/drivers/gpu/nvgpu/common/therm/therm_gv11b.c b/drivers/gpu/nvgpu/common/therm/therm_gv11b.c
index 419dd75e..971848fb 100644
--- a/drivers/gpu/nvgpu/common/therm/therm_gv11b.c
+++ b/drivers/gpu/nvgpu/common/therm/therm_gv11b.c
@@ -21,18 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-#include "gk20a/gk20a.h"
-#include "therm_gv11b.h"
-
 #include <nvgpu/soc.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
-
-#include <nvgpu/hw/gv11b/hw_therm_gv11b.h>
+#include <nvgpu/gk20a.h>
 
 #include "therm_gv11b.h"
 
+#include <nvgpu/hw/gv11b/hw_therm_gv11b.h>
+
 int gv11b_init_therm_setup_hw(struct gk20a *g)
 {
         u32 v;