diff options
| author | Mark Brown <broonie@kernel.org> | 2022-09-13 17:05:38 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-09-13 17:05:38 +0300 |
| commit | e2741d99420f2d961884649c1de6e19c9dace61f (patch) | |
| tree | bf8f125584922381e0cb4746e437e15f251f3d9f /drivers/virtio/virtio_pci_common.h | |
| parent | 26cc239f9e0167d710d2eb009aaa979c4c7a0859 (diff) | |
| parent | 7e18e42e4b280c85b76967a9106a13ca61c16179 (diff) | |
| download | linux-e2741d99420f2d961884649c1de6e19c9dace61f.tar.xz | |
ASoC: Merge tag 'v6.0-rc4' into asoc-6.1
Linux 6.0-rc4 so we can test on BeagleBone again.
Diffstat (limited to 'drivers/virtio/virtio_pci_common.h')
| -rw-r--r-- | drivers/virtio/virtio_pci_common.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h index c0448378b698..23112d84218f 100644 --- a/drivers/virtio/virtio_pci_common.h +++ b/drivers/virtio/virtio_pci_common.h @@ -80,7 +80,6 @@ struct virtio_pci_device { unsigned int idx, void (*callback)(struct virtqueue *vq), const char *name, - u32 size, bool ctx, u16 msix_vec); void (*del_vq)(struct virtio_pci_vq_info *info); @@ -111,7 +110,7 @@ void vp_del_vqs(struct virtio_device *vdev); /* the config->find_vqs() implementation */ int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs, struct virtqueue *vqs[], vq_callback_t *callbacks[], - const char * const names[], u32 sizes[], const bool *ctx, + const char * const names[], const bool *ctx, struct irq_affinity *desc); const char *vp_bus_name(struct virtio_device *vdev); |