diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 06:20:30 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 06:21:47 +0100 |
commit | d392da5207352f09030e95d9ea335a4225667ec0 (patch) | |
tree | 7d6cd1932afcad0a5619a5c504a6d93ca318187c /arch/powerpc/platforms/Kconfig | |
parent | powerpc/5xxx: extend mpc8xxx_gpio driver to support mpc512x gpios (diff) | |
parent | Linux 2.6.37-rc8 (diff) | |
download | linux-d392da5207352f09030e95d9ea335a4225667ec0.tar.xz linux-d392da5207352f09030e95d9ea335a4225667ec0.zip |
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 471115a13d1b..20576829eca5 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -21,6 +21,16 @@ source "arch/powerpc/platforms/44x/Kconfig" source "arch/powerpc/platforms/40x/Kconfig" source "arch/powerpc/platforms/amigaone/Kconfig" +config KVM_GUEST + bool "KVM Guest support" + default y + ---help--- + This option enables various optimizations for running under the KVM + hypervisor. Overhead for the kernel when not running inside KVM should + be minimal. + + In case of doubt, say Y + config PPC_NATIVE bool depends on 6xx || PPC64 @@ -106,8 +116,7 @@ config MMIO_NVRAM config MPIC_U3_HT_IRQS bool - depends on PPC_MAPLE - default y + default n config MPIC_BROKEN_REGREAD bool |