diff options
| author |   Jammy Zhou <Jammy.Zhou@amd.com> | 2015-10-21 17:15:45 +0800 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2015-12-21 16:42:43 -0500 |
| commit | dbd29f0d8513b0d660807beb13df94b00402ea57 (patch) | |
| tree | 71311481f9930e6b595f4ac9537630487689f295 | |
| parent | drm/amd/powerplay: Add PPLib debug print macro. (diff) | |
| download | linux-dev-dbd29f0d8513b0d660807beb13df94b00402ea57.tar.xz linux-dev-dbd29f0d8513b0d660807beb13df94b00402ea57.zip | |
drm/amdgpu: rename tonga_smumgr.h to tonga_smum.h
This conflicts with the tonga_smumgr.h from powerplay
in DKMS environement
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Jordan Lazare <Jordan.Lazare@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/tonga_smum.h (renamed from drivers/gpu/drm/amd/amdgpu/tonga_smumgr.h) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c index 204903897b4f..f4a1346525fe 100644 --- a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c @@ -24,7 +24,7 @@ #include <linux/firmware.h> #include "drmP.h" #include "amdgpu.h" -#include "tonga_smumgr.h" +#include "tonga_smum.h" MODULE_FIRMWARE("amdgpu/tonga_smc.bin"); diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_smc.c b/drivers/gpu/drm/amd/amdgpu/tonga_smc.c index 5421309c1862..361c49a82323 100644 --- a/drivers/gpu/drm/amd/amdgpu/tonga_smc.c +++ b/drivers/gpu/drm/amd/amdgpu/tonga_smc.c @@ -25,7 +25,7 @@ #include "drmP.h" #include "amdgpu.h" #include "tonga_ppsmc.h" -#include "tonga_smumgr.h" +#include "tonga_smum.h" #include "smu_ucode_xfer_vi.h" #include "amdgpu_ucode.h" diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_smumgr.h b/drivers/gpu/drm/amd/amdgpu/tonga_smum.h index c031ff99fe3e..c031ff99fe3e 100644 --- a/drivers/gpu/drm/amd/amdgpu/tonga_smumgr.h +++ b/drivers/gpu/drm/amd/amdgpu/tonga_smum.h |