x86: KVM guest: merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUEST
authorMarcelo Tosatti <mtosatti@redhat.com>
Thu, 16 Aug 2012 20:00:19 +0000 (17:00 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Thu, 23 Aug 2012 07:57:54 +0000 (04:57 -0300)
The distinction between CONFIG_KVM_CLOCK and CONFIG_KVM_GUEST is
not so clear anymore, as demonstrated by recent bugs caused by poor
handling of on/off combinations of these options.

Merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUEST.

Reported-By: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

No differences found