tree 246850e7f537b23a860523590f0a93a257fa0880
parent 4d8b81abc47b83a1939e59df2fdb0e98dfe0eedd
author Marcelo Tosatti <mtosatti@redhat.com> 1345147219 -0300
committer Marcelo Tosatti <mtosatti@redhat.com> 1345708674 -0300

x86: KVM guest: merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUEST

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>