From: Feifei Xu <Feifei.Xu@amd.com>
Date: Wed, 22 Nov 2017 07:23:20 +0000 (+0800)
Subject: drm/amd/include: cleanup vega10 umc header files.
X-Git-Tag: v4.16-rc1~31^2~33^2~38
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=90c7a9358fcbf5bfec84c1841122107f2cf5e489;p=uclinux-h8%2Flinux.git

drm/amd/include: cleanup vega10 umc header files.

Remove asic/vega10/UMC folder.

Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 9b6532a1622b..2bf943f7dd8d 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -36,7 +36,7 @@
 #include "athub/athub_1_0_offset.h"
 
 #include "soc15_common.h"
-#include "vega10/UMC/umc_6_0_sh_mask.h"
+#include "umc/umc_6_0_sh_mask.h"
 
 #include "nbio_v6_1.h"
 #include "nbio_v7_0.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_default.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_default.h
rename to drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_default.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_sh_mask.h