Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 2165b65..e06e395 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -1,7 +1,6 @@
 config PPC64
        bool "64-bit kernel"
        default n
-       select PPC_HAVE_PMU_SUPPORT
        help
          This option selects whether a 32-bit or a 64-bit kernel
          will be built.
@@ -69,6 +68,7 @@ choice
 config PPC_BOOK3S_64
        bool "Server processors"
        select PPC_FPU
+       select PPC_HAVE_PMU_SUPPORT
 
 config PPC_BOOK3E_64
        bool "Embedded processors"