drm/dri1 is the new home for all the legacy DRI1 drivers.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Suggested-by: Javier Martinez Canillas <javierm@xxxxxxxxxx>
---
drivers/gpu/drm/Makefile | 1 -
drivers/gpu/drm/dri1/Makefile | 1 +
drivers/gpu/drm/{ => dri1}/r128/Makefile | 0
drivers/gpu/drm/{ => dri1}/r128/ati_pcigart.c | 0
drivers/gpu/drm/{ => dri1}/r128/ati_pcigart.h | 0
drivers/gpu/drm/{ => dri1}/r128/r128_cce.c | 0
drivers/gpu/drm/{ => dri1}/r128/r128_drv.c | 0
drivers/gpu/drm/{ => dri1}/r128/r128_drv.h | 0
drivers/gpu/drm/{ => dri1}/r128/r128_ioc32.c | 0
drivers/gpu/drm/{ => dri1}/r128/r128_irq.c | 0
drivers/gpu/drm/{ => dri1}/r128/r128_state.c | 0
11 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/gpu/drm/{ => dri1}/r128/Makefile (100%)
rename drivers/gpu/drm/{ => dri1}/r128/ati_pcigart.c (100%)
rename drivers/gpu/drm/{ => dri1}/r128/ati_pcigart.h (100%)
rename drivers/gpu/drm/{ => dri1}/r128/r128_cce.c (100%)
rename drivers/gpu/drm/{ => dri1}/r128/r128_drv.c (100%)
rename drivers/gpu/drm/{ => dri1}/r128/r128_drv.h (100%)
rename drivers/gpu/drm/{ => dri1}/r128/r128_ioc32.c (100%)
rename drivers/gpu/drm/{ => dri1}/r128/r128_irq.c (100%)
rename drivers/gpu/drm/{ => dri1}/r128/r128_state.c (100%)
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 08a65237ce4e..0b6b33e64261 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -84,7 +84,6 @@ obj-y += display/
obj-$(CONFIG_DRM_TTM) += ttm/
obj-$(CONFIG_DRM_SCHED) += scheduler/
obj-$(CONFIG_DRM_DRI1) += dri1/
-obj-$(CONFIG_DRM_R128) += r128/
obj-$(CONFIG_DRM_RADEON)+= radeon/
obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/
obj-$(CONFIG_DRM_MGA) += mga/
diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile
index a3525b545670..f243aac48bb9 100644
--- a/drivers/gpu/drm/dri1/Makefile
+++ b/drivers/gpu/drm/dri1/Makefile
@@ -2,4 +2,5 @@
#
# Makefile for DRI1 drm device drivers
+obj-$(CONFIG_DRM_R128) += r128/
obj-$(CONFIG_DRM_TDFX) += tdfx/
diff --git a/drivers/gpu/drm/r128/Makefile b/drivers/gpu/drm/dri1/r128/Makefile
similarity index 100%
rename from drivers/gpu/drm/r128/Makefile
rename to drivers/gpu/drm/dri1/r128/Makefile
diff --git a/drivers/gpu/drm/r128/ati_pcigart.c b/drivers/gpu/drm/dri1/r128/ati_pcigart.c
similarity index 100%
rename from drivers/gpu/drm/r128/ati_pcigart.c
rename to drivers/gpu/drm/dri1/r128/ati_pcigart.c
diff --git a/drivers/gpu/drm/r128/ati_pcigart.h b/drivers/gpu/drm/dri1/r128/ati_pcigart.h
similarity index 100%
rename from drivers/gpu/drm/r128/ati_pcigart.h
rename to drivers/gpu/drm/dri1/r128/ati_pcigart.h
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/dri1/r128/r128_cce.c
similarity index 100%
rename from drivers/gpu/drm/r128/r128_cce.c
rename to drivers/gpu/drm/dri1/r128/r128_cce.c
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/dri1/r128/r128_drv.c
similarity index 100%
rename from drivers/gpu/drm/r128/r128_drv.c
rename to drivers/gpu/drm/dri1/r128/r128_drv.c
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/dri1/r128/r128_drv.h
similarity index 100%
rename from drivers/gpu/drm/r128/r128_drv.h
rename to drivers/gpu/drm/dri1/r128/r128_drv.h
diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/dri1/r128/r128_ioc32.c
similarity index 100%
rename from drivers/gpu/drm/r128/r128_ioc32.c
rename to drivers/gpu/drm/dri1/r128/r128_ioc32.c
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/dri1/r128/r128_irq.c
similarity index 100%
rename from drivers/gpu/drm/r128/r128_irq.c
rename to drivers/gpu/drm/dri1/r128/r128_irq.c
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/dri1/r128/r128_state.c
similarity index 100%
rename from drivers/gpu/drm/r128/r128_state.c
rename to drivers/gpu/drm/dri1/r128/r128_state.c
--
2.34.1
