Merge v2.6.37-rc8 into powerpc/next
[pandora-kernel.git] / arch / powerpc / platforms / Kconfig
index 471115a..2057682 100644 (file)
@@ -21,6 +21,16 @@ source "arch/powerpc/platforms/44x/Kconfig"
 source "arch/powerpc/platforms/40x/Kconfig"
 source "arch/powerpc/platforms/amigaone/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
 config PPC_NATIVE
        bool
        depends on 6xx || PPC64
@@ -106,8 +116,7 @@ config MMIO_NVRAM
 
 config MPIC_U3_HT_IRQS
        bool
 
 config MPIC_U3_HT_IRQS
        bool
-       depends on PPC_MAPLE
-       default y
+       default n
 
 config MPIC_BROKEN_REGREAD
        bool
 
 config MPIC_BROKEN_REGREAD
        bool