diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-01 13:31:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-01 13:31:46 +1000 |
| commit | 935babe1fde3fe67507b3d08984ec909e16a2c52 (patch) | |
| tree | 233a7a562c97c560899c8aebf6be1f4e1d693f7d /virt | |
| parent | 262173b68f370433c9ff8408a17242399233c96b (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 357e67cba32e..4e19bc812c29 100644 --- 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) |