Merge tag 'iwlwifi-for-kalle-2015-05-21' of https://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index e1068987bad1c6fef286d084ca245cafbe0a8934..a65eafb24997e547168b152f04f96fe2e1aba01e 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -32,7 +32,7 @@ config HAVE_OPROFILE
 
 config OPROFILE_NMI_TIMER
        def_bool y
-       depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI
+       depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !PPC64
 
 config KPROBES
        bool "Kprobes"