From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Thu, 16 Aug 2012 20:00:19 +0000 (-0300)
Subject: x86: KVM guest: merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUEST
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~15^2~43
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90993cdd1800dc6ef9587431a0c625b978584e81;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed