Merge branch 'for-linus' of git://neil.brown.name/md

[~andy/linux] / include / linux / kvm.h

diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index f47fcd30273dd2ce904b6ac0cf11fb963c04826c..c3892fc1d5389c86c664a43ca57bffa0f008d4b8 100644 (file)
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -555,7 +555,6 @@ struct kvm_ppc_pvinfo {
 #define KVM_CAP_PPC_SMT 64
 #define KVM_CAP_PPC_RMA        65
 #define KVM_CAP_MAX_VCPUS 66       /* returns max vcpus per vm */
-#define KVM_CAP_PPC_HIOR 67
 #define KVM_CAP_PPC_PAPR 68
 #define KVM_CAP_S390_GMAP 71