diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-25 11:59:53 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:05 -0600 |
| commit | e8d770e848ebc1ee18a0cb630262e2140e1f90bd (patch) | |
| tree | f9aad2c185b4636f9a1a4eabbc943c5db49d7761 /debian.master | |
| parent | 5bb8d487b017926e9630cba5527bb5a101939e5e (diff) | |
UBUNTU: [Config] Disable CONFIG_KVM_BOOK3S_64
Per the non-modular modules review, disable CONFIG_KVM_BOOK3S_64 for
consistency across all flavors.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 2 | ||||
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
| -rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ec83fd255bb..d4338d47ed9 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2647,7 +2647,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_ASYNC_PF=y CONFIG_KVM_BOOK3S_32=m CONFIG_KVM_BOOK3S_32_HANDLER=y -CONFIG_KVM_BOOK3S_64_HANDLER=y +# CONFIG_KVM_BOOK3S_64 is not set CONFIG_KVM_BOOK3S_HANDLER=y CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index e99f73cd08b..fc97da2c244 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -104,7 +104,6 @@ CONFIG_IRQ_PER_CPU=y CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_KSM=y CONFIG_KVM=y -# CONFIG_KVM_BOOK3S_64 is not set CONFIG_LAPBETHER=m # CONFIG_LEDS_GPIO is not set # CONFIG_LEDS_PCA9532 is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 9b0247743c5..22c7f31cd08 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -118,7 +118,6 @@ CONFIG_KERNEL_START=0xc000000000000000 CONFIG_KGDB=y CONFIG_KSM=y CONFIG_KVM=y -CONFIG_KVM_BOOK3S_64=y CONFIG_LAPBETHER=m CONFIG_LATENCYTOP=y # CONFIG_LEDS_GPIO is not set |