diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-14 08:53:40 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-14 08:53:40 -0600 |
| commit | ce34cf72fe508b27a78f83c184142e8d1e6a048a (patch) | |
| tree | ccc8c7d0c430edcacac6052b58495478928346d1 /linux-headers/linux/vfio.h | |
| parent | 662d263f280f6cfc82263a687b8322b69d2ed7db (diff) | |
| parent | a771c51703cf9f91023c6570426258bdf5ec775b (diff) | |
| download | focaccia-qemu-ce34cf72fe508b27a78f83c184142e8d1e6a048a.tar.gz focaccia-qemu-ce34cf72fe508b27a78f83c184142e8d1e6a048a.zip | |
Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-1.3.0-rc0' into staging
vfio-pci: KVM INTx accel & common msi_get_message * awilliam/tags/vfio-pci-for-qemu-1.3.0-rc0: vfio-pci: Use common msi_get_message vfio-pci: Add KVM INTx acceleration linux-headers: Update to 3.7-rc5 Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'linux-headers/linux/vfio.h')
| -rw-r--r-- | linux-headers/linux/vfio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h index f787b727a9..4758d1bfcf 100644 --- a/linux-headers/linux/vfio.h +++ b/linux-headers/linux/vfio.h @@ -8,8 +8,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef VFIO_H -#define VFIO_H +#ifndef _UAPIVFIO_H +#define _UAPIVFIO_H #include <linux/types.h> #include <linux/ioctl.h> @@ -365,4 +365,4 @@ struct vfio_iommu_type1_dma_unmap { #define VFIO_IOMMU_UNMAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 14) -#endif /* VFIO_H */ +#endif /* _UAPIVFIO_H */ |