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}/mga/Makefile | 0
drivers/gpu/drm/{ => dri1}/mga/mga_dma.c | 0
drivers/gpu/drm/{ => dri1}/mga/mga_drv.c | 0
drivers/gpu/drm/{ => dri1}/mga/mga_drv.h | 0
drivers/gpu/drm/{ => dri1}/mga/mga_ioc32.c | 0
drivers/gpu/drm/{ => dri1}/mga/mga_irq.c | 0
drivers/gpu/drm/{ => dri1}/mga/mga_state.c | 0
drivers/gpu/drm/{ => dri1}/mga/mga_warp.c | 0
10 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/gpu/drm/{ => dri1}/mga/Makefile (100%)
rename drivers/gpu/drm/{ => dri1}/mga/mga_dma.c (100%)
rename drivers/gpu/drm/{ => dri1}/mga/mga_drv.c (100%)
rename drivers/gpu/drm/{ => dri1}/mga/mga_drv.h (100%)
rename drivers/gpu/drm/{ => dri1}/mga/mga_ioc32.c (100%)
rename drivers/gpu/drm/{ => dri1}/mga/mga_irq.c (100%)
rename drivers/gpu/drm/{ => dri1}/mga/mga_state.c (100%)
rename drivers/gpu/drm/{ => dri1}/mga/mga_warp.c (100%)
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 9a664a4a021d..363cecfff919 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -86,7 +86,6 @@ obj-$(CONFIG_DRM_SCHED) += scheduler/
obj-$(CONFIG_DRM_DRI1) += dri1/
obj-$(CONFIG_DRM_RADEON)+= radeon/
obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/
-obj-$(CONFIG_DRM_MGA) += mga/
obj-$(CONFIG_DRM_I915) += i915/
obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb/
obj-$(CONFIG_DRM_MGAG200) += mgag200/
diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile
index d16bfdf26888..c254e443aa3a 100644
--- a/drivers/gpu/drm/dri1/Makefile
+++ b/drivers/gpu/drm/dri1/Makefile
@@ -3,5 +3,6 @@
# Makefile for DRI1 drm device drivers
obj-$(CONFIG_DRM_I810) += i810/
+obj-$(CONFIG_DRM_MGA) += mga/
obj-$(CONFIG_DRM_R128) += r128/
obj-$(CONFIG_DRM_TDFX) += tdfx/
diff --git a/drivers/gpu/drm/mga/Makefile b/drivers/gpu/drm/dri1/mga/Makefile
similarity index 100%
rename from drivers/gpu/drm/mga/Makefile
rename to drivers/gpu/drm/dri1/mga/Makefile
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/dri1/mga/mga_dma.c
similarity index 100%
rename from drivers/gpu/drm/mga/mga_dma.c
rename to drivers/gpu/drm/dri1/mga/mga_dma.c
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/dri1/mga/mga_drv.c
similarity index 100%
rename from drivers/gpu/drm/mga/mga_drv.c
rename to drivers/gpu/drm/dri1/mga/mga_drv.c
diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/dri1/mga/mga_drv.h
similarity index 100%
rename from drivers/gpu/drm/mga/mga_drv.h
rename to drivers/gpu/drm/dri1/mga/mga_drv.h
diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/dri1/mga/mga_ioc32.c
similarity index 100%
rename from drivers/gpu/drm/mga/mga_ioc32.c
rename to drivers/gpu/drm/dri1/mga/mga_ioc32.c
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/dri1/mga/mga_irq.c
similarity index 100%
rename from drivers/gpu/drm/mga/mga_irq.c
rename to drivers/gpu/drm/dri1/mga/mga_irq.c
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/dri1/mga/mga_state.c
similarity index 100%
rename from drivers/gpu/drm/mga/mga_state.c
rename to drivers/gpu/drm/dri1/mga/mga_state.c
diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/dri1/mga/mga_warp.c
similarity index 100%
rename from drivers/gpu/drm/mga/mga_warp.c
rename to drivers/gpu/drm/dri1/mga/mga_warp.c
--
2.34.1
