Merge commit 'origin/master' into next

[~andy/linux] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 25f8a9c2ba1a601aa09cfc5829472fcf0c1c4f72..cca6b4fc719a2a3eb3b7d774c5c2c4d2329e8c8d 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -1,6 +1,7 @@
 config PPC64
        bool "64-bit kernel"
        default n
+       select HAVE_PERF_COUNTERS
        help
          This option selects whether a 32-bit or a 64-bit kernel
          will be built.