diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-25 11:59:53 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:40:38 -0700 |
| commit | b311f6cb52269e525bdd9da8c82c4306488fe483 (patch) | |
| tree | 7afbc3f3aad6d9a6b3e8c835de13235dc374a74c /debian.master/config | |
| parent | 33522a40089b581d19e92d274770ce2f02afc3d9 (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/config')
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 3 | ||||
| -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, 4 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 8ff9fb7a055..dc9b7001af7 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2688,8 +2688,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_HV=y +# CONFIG_KVM_BOOK3S_64 is not set CONFIG_KVM_BOOK3S_HANDLER=y CONFIG_KVM_BOOK3S_PR=y CONFIG_KVM_CLOCK=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index b5d497ac8e6..ce63080acc8 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -106,7 +106,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 1d24497f988..71b26ec39f9 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -120,7 +120,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 |