Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next

[mirror_ubuntu-artful-kernel.git] / virt / kvm / kvm_main.c

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 357e67cba32eeddab73323356dbdc79d5736ae24..4e19bc812c29109bc5d978e116b509b1909cae92 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2825,10 +2825,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = {
        [KVM_DEV_TYPE_FSL_MPIC_20]      = &kvm_mpic_ops,
        [KVM_DEV_TYPE_FSL_MPIC_42]      = &kvm_mpic_ops,
 #endif
-
-#ifdef CONFIG_KVM_XICS
-       [KVM_DEV_TYPE_XICS]             = &kvm_xics_ops,
-#endif
 };
 
 int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type)