diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-23 14:54:10 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-23 14:54:10 +0800 |
| commit | 9a59ceb84312843046362a3503120ec6f70e56c5 (patch) | |
| tree | b7243f833d80778c0742cb40bb493c9f05111695 /include/linux/kvm_host.h | |
| parent | 7531142ed9492bcb94e20c1baeca19ab296a5b31 (diff) | |
| parent | 1dcd9896384ec3fe5c75829701d9babec7fe0d25 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.04-android
Diffstat (limited to 'include/linux/kvm_host.h')
| -rw-r--r-- | include/linux/kvm_host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 55d75a7cba73..bf933ba17529 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1054,7 +1054,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type); extern struct kvm_device_ops kvm_mpic_ops; extern struct kvm_device_ops kvm_xics_ops; -extern struct kvm_device_ops kvm_vfio_ops; #ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT |