diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 15:35:55 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 15:35:55 +1100 |
| commit | d2db277cb0384a66bd4b1b1bd4dbddb5f077a578 (patch) | |
| tree | 906ee885cafb72f9e9ca1bde4848f391be838af3 /include | |
| parent | 28e9f6c88b5a8b57b3066ece8aa003b746634520 (diff) | |
| parent | 80363894995b24fd79af2718f917f23595c72bfd (diff) | |
Merge remote-tracking branch 'vhost/linux-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/virtio_mmio.h (renamed from include/linux/virtio_mmio.h) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index a2e90722a4c4..6132cbbd9435 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -465,6 +465,7 @@ header-y += virtio_console.h header-y += virtio_gpu.h header-y += virtio_ids.h header-y += virtio_input.h +header-y += virtio_mmio.h header-y += virtio_net.h header-y += virtio_pci.h header-y += virtio_ring.h diff --git a/include/linux/virtio_mmio.h b/include/uapi/linux/virtio_mmio.h index c4b09689ab64..c4b09689ab64 100644 --- a/include/linux/virtio_mmio.h +++ b/include/uapi/linux/virtio_mmio.h |