[PATCH v1 07/11] drm/sis: Move the sis 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}/sis/Makefile  | 0
 drivers/gpu/drm/{ => dri1}/sis/sis_drv.c | 0
 drivers/gpu/drm/{ => dri1}/sis/sis_drv.h | 0
 drivers/gpu/drm/{ => dri1}/sis/sis_mm.c  | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename drivers/gpu/drm/{ => dri1}/sis/Makefile (100%)
 rename drivers/gpu/drm/{ => dri1}/sis/sis_drv.c (100%)
 rename drivers/gpu/drm/{ => dri1}/sis/sis_drv.h (100%)
 rename drivers/gpu/drm/{ => dri1}/sis/sis_mm.c (100%)

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 363cecfff919..7de784da6345 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -91,7 +91,6 @@ obj-$(CONFIG_DRM_KMB_DISPLAY)  += kmb/
 obj-$(CONFIG_DRM_MGAG200) += mgag200/
 obj-$(CONFIG_DRM_V3D)  += v3d/
 obj-$(CONFIG_DRM_VC4)  += vc4/
-obj-$(CONFIG_DRM_SIS)   += sis/
 obj-$(CONFIG_DRM_SAVAGE)+= savage/
 obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
 obj-$(CONFIG_DRM_VIA)	+=via/
diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile
index c254e443aa3a..23e33398fdf5 100644
--- a/drivers/gpu/drm/dri1/Makefile
+++ b/drivers/gpu/drm/dri1/Makefile
@@ -5,4 +5,5 @@
 obj-$(CONFIG_DRM_I810)		+= i810/
 obj-$(CONFIG_DRM_MGA)		+= mga/
 obj-$(CONFIG_DRM_R128)		+= r128/
+obj-$(CONFIG_DRM_SIS)		+= sis/
 obj-$(CONFIG_DRM_TDFX)		+= tdfx/
diff --git a/drivers/gpu/drm/sis/Makefile b/drivers/gpu/drm/dri1/sis/Makefile
similarity index 100%
rename from drivers/gpu/drm/sis/Makefile
rename to drivers/gpu/drm/dri1/sis/Makefile
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/dri1/sis/sis_drv.c
similarity index 100%
rename from drivers/gpu/drm/sis/sis_drv.c
rename to drivers/gpu/drm/dri1/sis/sis_drv.c
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/dri1/sis/sis_drv.h
similarity index 100%
rename from drivers/gpu/drm/sis/sis_drv.h
rename to drivers/gpu/drm/dri1/sis/sis_drv.h
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/dri1/sis/sis_mm.c
similarity index 100%
rename from drivers/gpu/drm/sis/sis_mm.c
rename to drivers/gpu/drm/dri1/sis/sis_mm.c
-- 
2.34.1