Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index be0e29f..f998e65 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -103,6 +103,8 @@ config PPC_BOOK3S_64
        select ARCH_SUPPORTS_NUMA_BALANCING
        select IRQ_WORK
        select PPC_MM_SLICES
+       select PPC_HAVE_KUEP
+       select PPC_HAVE_KUAP
 
 config PPC_BOOK3E_64
        bool "Embedded processors"
@@ -308,6 +310,7 @@ config PHYS_64BIT
 config ALTIVEC
        bool "AltiVec Support"
        depends on PPC_BOOK3S_32 || PPC_BOOK3S_64 || (PPC_E500MC && PPC64)
+       select PPC_FPU
        help
          This option enables kernel support for the Altivec extensions to the
          PowerPC processor. The kernel currently supports saving and restoring
@@ -361,8 +364,6 @@ config PPC_RADIX_MMU
        bool "Radix MMU Support"
        depends on PPC_BOOK3S_64
        select ARCH_HAS_GIGANTIC_PAGE
-       select PPC_HAVE_KUEP
-       select PPC_HAVE_KUAP
        default y
        help
          Enable support for the Power ISA 3.0 Radix style MMU. Currently this