From 1b568d934eec1c5c99565c41f6c8ca66e9743e96 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Tue, 7 Jul 2015 11:41:01 +0200 Subject: [PATCH] virtio/s390: rename drivers/s390/kvm -> drivers/s390/virtio This more accurately reflects what these drivers actually do. Suggested-by: Paolo Bonzini Acked-by: Christian Borntraeger Signed-off-by: Cornelia Huck Signed-off-by: Michael S. Tsirkin --- MAINTAINERS | 2 +- drivers/s390/Makefile | 2 +- drivers/s390/{kvm => virtio}/Makefile | 0 drivers/s390/{kvm => virtio}/kvm_virtio.c | 0 drivers/s390/{kvm => virtio}/virtio_ccw.c | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename drivers/s390/{kvm => virtio}/Makefile (100%) rename drivers/s390/{kvm => virtio}/kvm_virtio.c (100%) rename drivers/s390/{kvm => virtio}/virtio_ccw.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 280a5681d5b2..fbef7d0a4dd5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10577,7 +10577,7 @@ L: linux-s390@vger.kernel.org L: virtualization@lists.linux-foundation.org L: kvm@vger.kernel.org S: Supported -F: drivers/s390/kvm/ +F: drivers/s390/virtio/ VIRTIO HOST (VHOST) M: "Michael S. Tsirkin" diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile index 95bccfd3f169..e5225ad9c5b1 100644 --- a/drivers/s390/Makefile +++ b/drivers/s390/Makefile @@ -2,7 +2,7 @@ # Makefile for the S/390 specific device drivers # -obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/ +obj-y += cio/ block/ char/ crypto/ net/ scsi/ virtio/ drivers-y += drivers/s390/built-in.o diff --git a/drivers/s390/kvm/Makefile b/drivers/s390/virtio/Makefile similarity index 100% rename from drivers/s390/kvm/Makefile rename to drivers/s390/virtio/Makefile diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/virtio/kvm_virtio.c similarity index 100% rename from drivers/s390/kvm/kvm_virtio.c rename to drivers/s390/virtio/kvm_virtio.c diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c similarity index 100% rename from drivers/s390/kvm/virtio_ccw.c rename to drivers/s390/virtio/virtio_ccw.c -- GitLab