projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
virtio
/
virtio_mmio.c
diff --git
a/drivers/virtio/virtio_mmio.c
b/drivers/virtio/virtio_mmio.c
index 31f966f4d27f6800899fa8cad4b6e390fd497003..1ba0d683101525b1615cc03beea3524f42318694 100644
(file)
--- a/
drivers/virtio/virtio_mmio.c
+++ b/
drivers/virtio/virtio_mmio.c
@@
-75,7
+75,7
@@
*
* 0x050 W QueueNotify Queue notifier
* 0x060 R InterruptStatus Interrupt status register
*
* 0x050 W QueueNotify Queue notifier
* 0x060 R InterruptStatus Interrupt status register
- * 0x06
0
W InterruptACK Interrupt acknowledge register
+ * 0x06
4
W InterruptACK Interrupt acknowledge register
* 0x070 RW Status Device status register
*
* 0x100+ RW Device-specific configuration space
* 0x070 RW Status Device status register
*
* 0x100+ RW Device-specific configuration space
@@
-423,7
+423,7
@@
static const char *vm_bus_name(struct virtio_device *vdev)
return vm_dev->pdev->name;
}
return vm_dev->pdev->name;
}
-static struct virtio_config_ops virtio_mmio_config_ops = {
+static
const
struct virtio_config_ops virtio_mmio_config_ops = {
.get = vm_get,
.set = vm_set,
.get_status = vm_get_status,
.get = vm_get,
.set = vm_set,
.get_status = vm_get_status,