summary refs log tree commit diff stats
path: root/linux-headers/asm-s390/kvm_para.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-11-14 08:53:40 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-11-14 08:53:40 -0600
commitce34cf72fe508b27a78f83c184142e8d1e6a048a (patch)
treeccc8c7d0c430edcacac6052b58495478928346d1 /linux-headers/asm-s390/kvm_para.h
parent662d263f280f6cfc82263a687b8322b69d2ed7db (diff)
parenta771c51703cf9f91023c6570426258bdf5ec775b (diff)
downloadfocaccia-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/asm-s390/kvm_para.h')
-rw-r--r--linux-headers/asm-s390/kvm_para.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/linux-headers/asm-s390/kvm_para.h b/linux-headers/asm-s390/kvm_para.h
index 870051f645..ff1f4e7b30 100644
--- a/linux-headers/asm-s390/kvm_para.h
+++ b/linux-headers/asm-s390/kvm_para.h
@@ -1,5 +1,5 @@
 /*
- * definition for paravirtual devices on s390
+ * User API definitions for paravirtual devices on s390
  *
  * Copyright IBM Corp. 2008
  *
@@ -9,9 +9,3 @@
  *
  *    Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
  */
-
-#ifndef __S390_KVM_PARA_H
-#define __S390_KVM_PARA_H
-
-
-#endif /* __S390_KVM_PARA_H */