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/kvm_para.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/kvm_para.h')
| -rw-r--r-- | linux-headers/linux/kvm_para.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-headers/linux/kvm_para.h b/linux-headers/linux/kvm_para.h index 7bdcf93c1d..cea2c5c72d 100644 --- a/linux-headers/linux/kvm_para.h +++ b/linux-headers/linux/kvm_para.h @@ -1,5 +1,5 @@ -#ifndef __LINUX_KVM_PARA_H -#define __LINUX_KVM_PARA_H +#ifndef _UAPI__LINUX_KVM_PARA_H +#define _UAPI__LINUX_KVM_PARA_H /* * This header file provides a method for making a hypercall to the host @@ -25,4 +25,4 @@ */ #include <asm/kvm_para.h> -#endif /* __LINUX_KVM_PARA_H */ +#endif /* _UAPI__LINUX_KVM_PARA_H */ |