Commit 1e0c7594 authored by Jammy Zhou's avatar Jammy Zhou Committed by Tim Gardner

drm/amdgpu: rename tonga_smumgr.h to tonga_smum.h

BugLink: http://bugs.launchpad.net/bugs/1546572

This conflicts with the tonga_smumgr.h from powerplay
in DKMS environement
Signed-off-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarJordan Lazare <Jordan.Lazare@amd.com>
(cherry picked from commit dbd29f0d)
Signed-off-by: default avatarAlberto Milone <alberto.milone@canonical.com>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent 41824f7c
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include "drmP.h" #include "drmP.h"
#include "amdgpu.h" #include "amdgpu.h"
#include "tonga_smumgr.h" #include "tonga_smum.h"
MODULE_FIRMWARE("amdgpu/tonga_smc.bin"); MODULE_FIRMWARE("amdgpu/tonga_smc.bin");
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "drmP.h" #include "drmP.h"
#include "amdgpu.h" #include "amdgpu.h"
#include "tonga_ppsmc.h" #include "tonga_ppsmc.h"
#include "tonga_smumgr.h" #include "tonga_smum.h"
#include "smu_ucode_xfer_vi.h" #include "smu_ucode_xfer_vi.h"
#include "amdgpu_ucode.h" #include "amdgpu_ucode.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment