diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 20:19:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 20:19:31 -0800 |
| commit | 9b82e65d65c90faecc408bcdc14a0229736ed193 (patch) | |
| tree | 2cf5fd4f4df01c6488afd0046325405381a73e36 /include/linux/virtio_mmio.h | |
| parent | 8174a06eba10a43375d1dd6f74c58a71519e3be5 (diff) | |
| parent | e6af578c5305be693a1bc7f4dc7b51dd82d41425 (diff) | |
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux:
virtio-pci: make reset operation safer
virtio-mmio: Correct the name of the guest features selector
virtio: add HAS_IOMEM dependency to MMIO platform bus driver
Diffstat (limited to 'include/linux/virtio_mmio.h')
| -rw-r--r-- | include/linux/virtio_mmio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/virtio_mmio.h b/include/linux/virtio_mmio.h index 27c7edefbc86..5c7b6f0daef8 100644 --- a/include/linux/virtio_mmio.h +++ b/include/linux/virtio_mmio.h @@ -63,7 +63,7 @@ #define VIRTIO_MMIO_GUEST_FEATURES 0x020 /* Activated features set selector - Write Only */ -#define VIRTIO_MMIO_GUEST_FEATURES_SET 0x024 +#define VIRTIO_MMIO_GUEST_FEATURES_SEL 0x024 /* Guest's memory page size in bytes - Write Only */ #define VIRTIO_MMIO_GUEST_PAGE_SIZE 0x028 |