From b57fd5663e34f024406936283475f4c0eadbfc96 Mon Sep 17 00:00:00 2001 From: Jammy Zhou Date: Wed, 21 Oct 2015 17:18:10 +0800 Subject: [PATCH] drm/amdgpu: rename fiji_smumgr.h to fiji_smum.h This conflicts with fiji_smumgr.h from powerplay in DKMS environment Signed-off-by: Jammy Zhou Reviewed-by: Alex Deucher Signed-off-by: Jordan Lazare --- drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 2 +- drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 2 +- drivers/gpu/drm/amd/amdgpu/{fiji_smumgr.h => fiji_smum.h} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/gpu/drm/amd/amdgpu/{fiji_smumgr.h => fiji_smum.h} (100%) diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c index 8f9845d9a986..4b0e45a27129 100644 --- a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c @@ -24,7 +24,7 @@ #include #include "drmP.h" #include "amdgpu.h" -#include "fiji_smumgr.h" +#include "fiji_smum.h" MODULE_FIRMWARE("amdgpu/fiji_smc.bin"); diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_smc.c b/drivers/gpu/drm/amd/amdgpu/fiji_smc.c index bda1249eb871..e35340afd3db 100644 --- a/drivers/gpu/drm/amd/amdgpu/fiji_smc.c +++ b/drivers/gpu/drm/amd/amdgpu/fiji_smc.c @@ -25,7 +25,7 @@ #include "drmP.h" #include "amdgpu.h" #include "fiji_ppsmc.h" -#include "fiji_smumgr.h" +#include "fiji_smum.h" #include "smu_ucode_xfer_vi.h" #include "amdgpu_ucode.h" diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_smumgr.h b/drivers/gpu/drm/amd/amdgpu/fiji_smum.h similarity index 100% rename from drivers/gpu/drm/amd/amdgpu/fiji_smumgr.h rename to drivers/gpu/drm/amd/amdgpu/fiji_smum.h -- 2.11.0