diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:13:10 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:13:10 -0500 |
| commit | d6034a3a61235042a0d79dcc1dfed0fbf461fb18 (patch) | |
| tree | 78625b5d83f8b8410fccc9c008e201da11697449 /hw | |
| parent | fdba9594df8eb2e2ac16bba95308e4159ffbb9e4 (diff) | |
| parent | ca98557ad2510eaeb6538b4c4d9972818e83b6c2 (diff) | |
| download | qemu-d6034a3a61235042a0d79dcc1dfed0fbf461fb18.tar.gz | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/kvmclock.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/hw/kvmclock.c b/hw/kvmclock.c index 004c4add8c..692ad182f0 100644 --- a/hw/kvmclock.c +++ b/hw/kvmclock.c @@ -17,8 +17,6 @@ #include "kvm.h" #include "kvmclock.h" -#if defined(CONFIG_KVM_PARA) && defined(KVM_CAP_ADJUST_CLOCK) - #include <linux/kvm.h> #include <linux/kvm_para.h> @@ -120,10 +118,3 @@ static void kvmclock_register_device(void) } device_init(kvmclock_register_device); - -#else /* !(CONFIG_KVM_PARA && KVM_CAP_ADJUST_CLOCK) */ - -void kvmclock_create(void) -{ -} -#endif /* !(CONFIG_KVM_PARA && KVM_CAP_ADJUST_CLOCK) */ |