diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-09 12:12:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-09 12:13:02 +1000 |
| commit | 84274b2770b88e098b58c7cd14b9093ae1205b6e (patch) | |
| tree | 33d655866a0435d063c604ffe9c44c173b1f666c /virt | |
| parent | 06865b1ce7056a2b0b8a6e2d096ca544ed0ccbae (diff) | |
| parent | fb7dcf723dd2cb1d5d8f2f49c3023130938848e3 (diff) | |
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 6e3b12c1925a..d96c58b6995d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2848,10 +2848,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) |