Merge branch 'fix/misc' into for-linus

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

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index cca6b4f..61187be 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -1,7 +1,7 @@
 config PPC64
        bool "64-bit kernel"
        default n
-       select HAVE_PERF_COUNTERS
+       select PPC_HAVE_PMU_SUPPORT
        help
          This option selects whether a 32-bit or a 64-bit kernel
          will be built.
@@ -21,7 +21,7 @@ choice
 
          If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
 
-config PPC_BOOK3S
+config PPC_BOOK3S_32
        bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
        select PPC_FPU
 
@@ -57,11 +57,14 @@ config E200
 
 endchoice
 
-config PPC_BOOK3S
-       default y
+config PPC_BOOK3S_64
+       def_bool y
        depends on PPC64
        select PPC_FPU
 
+config PPC_BOOK3S
+       def_bool y
+       depends on PPC_BOOK3S_32 || PPC_BOOK3S_64
 
 config POWER4_ONLY
        bool "Optimize for POWER4"
@@ -75,6 +78,7 @@ config POWER4_ONLY
 config 6xx
        def_bool y
        depends on PPC32 && PPC_BOOK3S
+       select PPC_HAVE_PMU_SUPPORT
 
 config POWER3
        bool
@@ -243,6 +247,15 @@ config VIRT_CPU_ACCOUNTING
 
          If in doubt, say Y here.
 
+config PPC_HAVE_PMU_SUPPORT
+       bool
+
+config PPC_PERF_CTRS
+       def_bool y
+       depends on PERF_COUNTERS && PPC_HAVE_PMU_SUPPORT
+       help
+         This enables the powerpc-specific perf_counter back-end.
+
 config SMP
        depends on PPC_STD_MMU || FSL_BOOKE
        bool "Symmetric multi-processing support"