[PATCH v1 08/11] drm/via: Move the via driver to drm/dri1/

[Sam Ravnborg]

drm/dri1 is the new home for all the legacy DRI1 drivers.
Used the opportunity to rename the file to via.c to match the
name of the driver.

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}/via/Makefile            | 4 +---
 drivers/gpu/drm/{via/via_dri1.c => dri1/via/via.c} | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename drivers/gpu/drm/{ => dri1}/via/Makefile (77%)
 rename drivers/gpu/drm/{via/via_dri1.c => dri1/via/via.c} (99%)

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 7de784da6345..bb3d8ffb9dd6 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -93,7 +93,6 @@ obj-$(CONFIG_DRM_V3D)  += v3d/
 obj-$(CONFIG_DRM_VC4)  += vc4/
 obj-$(CONFIG_DRM_SAVAGE)+= savage/
 obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
-obj-$(CONFIG_DRM_VIA)	+=via/
 obj-$(CONFIG_DRM_VGEM)	+= vgem/
 obj-$(CONFIG_DRM_VKMS)	+= vkms/
 obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile
index 23e33398fdf5..73c0aa1c7b94 100644
--- a/drivers/gpu/drm/dri1/Makefile
+++ b/drivers/gpu/drm/dri1/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_DRM_MGA)		+= mga/
 obj-$(CONFIG_DRM_R128)		+= r128/
 obj-$(CONFIG_DRM_SIS)		+= sis/
 obj-$(CONFIG_DRM_TDFX)		+= tdfx/
+obj-$(CONFIG_DRM_VIA)		+= via/
diff --git a/drivers/gpu/drm/via/Makefile b/drivers/gpu/drm/dri1/via/Makefile
similarity index 77%
rename from drivers/gpu/drm/via/Makefile
rename to drivers/gpu/drm/dri1/via/Makefile
index 8b978dd51a25..b7cd59c2e226 100644
--- a/drivers/gpu/drm/via/Makefile
+++ b/drivers/gpu/drm/dri1/via/Makefile
@@ -3,6 +3,4 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-via-y    := via_dri1.o
-
-obj-$(CONFIG_DRM_VIA)	+=via.o
+obj-$(CONFIG_DRM_VIA)	+= via.o
diff --git a/drivers/gpu/drm/via/via_dri1.c b/drivers/gpu/drm/dri1/via/via.c
similarity index 99%
rename from drivers/gpu/drm/via/via_dri1.c
rename to drivers/gpu/drm/dri1/via/via.c
index c5708a3f4530..24bc3ebe66e1 100644
--- a/drivers/gpu/drm/via/via_dri1.c
+++ b/drivers/gpu/drm/dri1/via/via.c
@@ -44,7 +44,7 @@
 #include <drm/drm_vblank.h>
 #include <drm/via_drm.h>
 
-#include "via_3d_reg.h"
+#include "../../via/via_3d_reg.h"
 
 #define DRIVER_AUTHOR	"Various"
 
-- 
2.34.1