diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 23:49:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 23:49:12 +0100 |
| commit | 3c834b6f41fa21a48389b13c3bf63aa8df1d7080 (patch) | |
| tree | 126447276497510f44277e8442715e103e2cb85a /drivers/s390/kvm | |
| parent | Merge tag 'vfio-v3.9-rc1' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | virtio_console: Initialize guest_connected=true for rproc_serial (diff) | |
| download | linux-3c834b6f41fa21a48389b13c3bf63aa8df1d7080.tar.xz linux-3c834b6f41fa21a48389b13c3bf63aa8df1d7080.zip | |
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull virtio updates from Rusty Russell:
"All trivial, thanks to the stuff which didn't quite make it time"
* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
virtio_console: Initialize guest_connected=true for rproc_serial
virtio: use module_virtio_driver.
virtio: Add module driver macro for virtio drivers.
virtio_console: Use virtio device index to generate port name
virtio: make pci_device_id const
virtio: make config_ops const
virtio-mmio: fix wrong comment about register offset
virtio_console: Let unconnected rproc device receive data.
Diffstat (limited to 'drivers/s390/kvm')
| -rw-r--r-- | drivers/s390/kvm/kvm_virtio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c index 03a15e016778..6711e65764b5 100644 --- a/drivers/s390/kvm/kvm_virtio.c +++ b/drivers/s390/kvm/kvm_virtio.c @@ -275,7 +275,7 @@ static const char *kvm_bus_name(struct virtio_device *vdev) /* * The config ops structure as defined by virtio config */ -static struct virtio_config_ops kvm_vq_configspace_ops = { +static const struct virtio_config_ops kvm_vq_configspace_ops = { .get_features = kvm_get_features, .finalize_features = kvm_finalize_features, .get = kvm_get, |