diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-12-08 16:39:45 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-12-09 21:42:05 +0200 |
| commit | 5f4c976089ca176c7780c0431308b4e71041702a (patch) | |
| tree | 0678b2379b7a38c6ed9759b9280f04ddaf2a9a68 | |
| parent | a90fdce9dcf3b65f998058bea612e0026c6deaf5 (diff) | |
virtio_pci: rename virtio_pci -> virtio_pci_common
kbuild does not seem to like it when we name source
files same as the module.
Let's rename virtio_pci -> virtio_pci_common,
and get rid of #include-ing c files.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | drivers/virtio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/virtio/virtio_pci_common.c (renamed from drivers/virtio/virtio_pci.c) | 2 | ||||
| -rw-r--r-- | drivers/virtio/virtio_pci_common.h (renamed from drivers/virtio/virtio_pci.h) | 4 | ||||
| -rw-r--r-- | drivers/virtio/virtio_pci_legacy.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile index 9076635697bb..bf5104b56894 100644 --- a/drivers/virtio/Makefile +++ b/drivers/virtio/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o +virtio_pci-y := virtio_pci_legacy.o virtio_pci_common.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci_common.c index 5d6bc773edab..953057d84185 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci_common.c @@ -17,7 +17,7 @@ * */ -#include "virtio_pci_legacy.c" +#include "virtio_pci_common.h" /* wait for pending irq handlers */ void vp_synchronize_vectors(struct virtio_device *vdev) diff --git a/drivers/virtio/virtio_pci.h b/drivers/virtio/virtio_pci_common.h index fba383c04d37..d840dad4149d 100644 --- a/drivers/virtio/virtio_pci.h +++ b/drivers/virtio/virtio_pci_common.h @@ -1,5 +1,5 @@ -#ifndef _DRIVERS_VIRTIO_VIRTIO_PCI_H -#define _DRIVERS_VIRTIO_VIRTIO_PCI_H +#ifndef _DRIVERS_VIRTIO_VIRTIO_PCI_COMMON_H +#define _DRIVERS_VIRTIO_VIRTIO_PCI_COMMON_H /* * Virtio PCI driver - APIs for common functionality for all device versions * diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c index d3b0a781f593..2588252e5c1c 100644 --- a/drivers/virtio/virtio_pci_legacy.c +++ b/drivers/virtio/virtio_pci_legacy.c @@ -17,7 +17,7 @@ * */ -#include "virtio_pci.h" +#include "virtio_pci_common.h" /* Qumranet donated their vendor ID for devices 0x1000 thru 0x10FF. */ static const struct pci_device_id virtio_pci_id_table[] = { |