[PATCH v1 05/11] drm/i810: Move the i810 driver to drm/dri1/

[Sam Ravnborg]

drm/dri1 is the new home for all the legacy DRI1 drivers.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Suggested-by: Javier Martinez Canillas <javierm at redhat.com>
---
 drivers/gpu/drm/Makefile                   | 1 -
 drivers/gpu/drm/dri1/Makefile              | 1 +
 drivers/gpu/drm/{ => dri1}/i810/Makefile   | 0
 drivers/gpu/drm/{ => dri1}/i810/i810_dma.c | 0
 drivers/gpu/drm/{ => dri1}/i810/i810_drv.c | 0
 drivers/gpu/drm/{ => dri1}/i810/i810_drv.h | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename drivers/gpu/drm/{ => dri1}/i810/Makefile (100%)
 rename drivers/gpu/drm/{ => dri1}/i810/i810_dma.c (100%)
 rename drivers/gpu/drm/{ => dri1}/i810/i810_drv.c (100%)
 rename drivers/gpu/drm/{ => dri1}/i810/i810_drv.h (100%)

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 0b6b33e64261..9a664a4a021d 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -87,7 +87,6 @@ obj-$(CONFIG_DRM_DRI1)	+= dri1/
 obj-$(CONFIG_DRM_RADEON)+= radeon/
 obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/
 obj-$(CONFIG_DRM_MGA)	+= mga/
-obj-$(CONFIG_DRM_I810)	+= i810/
 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 f243aac48bb9..d16bfdf26888 100644
--- a/drivers/gpu/drm/dri1/Makefile
+++ b/drivers/gpu/drm/dri1/Makefile
@@ -2,5 +2,6 @@
 #
 # Makefile for DRI1 drm device drivers
 
+obj-$(CONFIG_DRM_I810)		+= i810/
 obj-$(CONFIG_DRM_R128)		+= r128/
 obj-$(CONFIG_DRM_TDFX)		+= tdfx/
diff --git a/drivers/gpu/drm/i810/Makefile b/drivers/gpu/drm/dri1/i810/Makefile
similarity index 100%
rename from drivers/gpu/drm/i810/Makefile
rename to drivers/gpu/drm/dri1/i810/Makefile
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/dri1/i810/i810_dma.c
similarity index 100%
rename from drivers/gpu/drm/i810/i810_dma.c
rename to drivers/gpu/drm/dri1/i810/i810_dma.c
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/dri1/i810/i810_drv.c
similarity index 100%
rename from drivers/gpu/drm/i810/i810_drv.c
rename to drivers/gpu/drm/dri1/i810/i810_drv.c
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/dri1/i810/i810_drv.h
similarity index 100%
rename from drivers/gpu/drm/i810/i810_drv.h
rename to drivers/gpu/drm/dri1/i810/i810_drv.h
-- 
2.34.1