Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index f970ca2..b9ba861 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -24,7 +24,7 @@ source "arch/powerpc/platforms/wsp/Kconfig"
 
 config KVM_GUEST
        bool "KVM Guest support"
-       default y
+       default n
        ---help---
          This option enables various optimizations for running under the KVM
          hypervisor. Overhead for the kernel when not running inside KVM should
@@ -78,6 +78,10 @@ config MPIC
        bool
        default n
 
+config PPC_EPAPR_HV_PIC
+       bool
+       default n
+
 config MPIC_WEIRD
        bool
        default n
@@ -266,7 +270,7 @@ config TAU_AVERAGE
 
 config QUICC_ENGINE
        bool "Freescale QUICC Engine (QE) Support"
-       depends on FSL_SOC
+       depends on FSL_SOC && PPC32
        select PPC_LIB_RHEAP
        select CRC32
        help