Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jammy Zhou and committed by
Alex Deucher
dbd29f0d 6bd48d24

+2 -2
+1 -1
drivers/gpu/drm/amd/amdgpu/tonga_dpm.c
··· 24 24 #include <linux/firmware.h> 25 25 #include "drmP.h" 26 26 #include "amdgpu.h" 27 - #include "tonga_smumgr.h" 27 + #include "tonga_smum.h" 28 28 29 29 MODULE_FIRMWARE("amdgpu/tonga_smc.bin"); 30 30
+1 -1
drivers/gpu/drm/amd/amdgpu/tonga_smc.c
··· 25 25 #include "drmP.h" 26 26 #include "amdgpu.h" 27 27 #include "tonga_ppsmc.h" 28 - #include "tonga_smumgr.h" 28 + #include "tonga_smum.h" 29 29 #include "smu_ucode_xfer_vi.h" 30 30 #include "amdgpu_ucode.h" 31 31
drivers/gpu/drm/amd/amdgpu/tonga_smumgr.h drivers/gpu/drm/amd/amdgpu/tonga_smum.h